diff --git a/libs/generic/functional.h b/libs/generic/functional.h
index ca1d8630..bd253486 100644
--- a/libs/generic/functional.h
+++ b/libs/generic/functional.h
@@ -296,23 +296,17 @@ public:
   }
 };
 
-template<typename Type, typename Other, typename True, typename False>
+template<typename Other, typename True, typename False, typename Type>
 class TypeEqual
 {
-  template<typename Matched>
-  class Match
-  {
-  public:
-    typedef False type;
-  };
-  template<>
-  class Match<Other>
-  {
-  public:
-    typedef True type;
-  };
 public:
-  typedef typename Match<Type>::type type;
+  typedef False type;
+};
+template<typename Other, typename True, typename False>
+class TypeEqual<Other, True, False, Other>
+{
+public:
+  typedef True type;
 };
 
 
diff --git a/libs/signal/isignal.h b/libs/signal/isignal.h
index e6cb215d..4fe27471 100644
--- a/libs/signal/isignal.h
+++ b/libs/signal/isignal.h
@@ -89,10 +89,10 @@ public:
   template<typename Caller>
   SignalHandler(const BindFirstOpaque<Caller>& caller)
     : Callback0<SignalHandlerResult>(BindFirstOpaque<typename TypeEqual<
-      typename Caller::result_type,
       SignalHandlerResult,
       Caller,
-      SignalHandlerCaller1<Caller>
+      SignalHandlerCaller1<Caller>,
+      typename Caller::result_type
     >::type>(caller.getBound()))
   {
   }
@@ -117,10 +117,10 @@ public:
   template<typename Caller>
   SignalHandler1(const BindFirstOpaque1<Caller>& caller)
     : Callback1<FirstArgument, SignalHandlerResult>(BindFirstOpaque1<typename TypeEqual<
-      typename Caller::result_type,
       SignalHandlerResult,
       Caller,
-      SignalHandlerCaller2<Caller>
+      SignalHandlerCaller2<Caller>,
+      typename Caller::result_type
     >::type>(caller.getBound()))
   {
   }
@@ -145,10 +145,10 @@ public:
   template<typename Caller>
   SignalHandler2(const BindFirstOpaque2<Caller>& caller)
     : Callback2<FirstArgument, SecondArgument, SignalHandlerResult>(BindFirstOpaque2<typename TypeEqual<
-      typename Caller::result_type,
       SignalHandlerResult,
       Caller,
-      SignalHandlerCaller3<Caller>
+      SignalHandlerCaller3<Caller>,
+      typename Caller::result_type
     >::type>(caller.getBound()))
   {
   }
@@ -185,10 +185,10 @@ public:
   template<typename Caller>
   SignalHandler3(const BindFirstOpaque3<Caller>& caller)
     : Callback3<FirstArgument, SecondArgument, ThirdArgument, SignalHandlerResult>(BindFirstOpaque3<typename TypeEqual<
-      typename Caller::result_type,
       SignalHandlerResult,
       Caller,
-      SignalHandlerCaller4<Caller>
+      SignalHandlerCaller4<Caller>,
+      typename Caller::result_type
     >::type>(caller.getBound()))
   {
   }