diff --git a/src/libraries/turtle/format.hpp b/src/libraries/turtle/format.hpp
index 81b7fcc..6b8345a 100644
--- a/src/libraries/turtle/format.hpp
+++ b/src/libraries/turtle/format.hpp
@@ -50,7 +50,7 @@ namespace detail
     template< typename T >
     std::string serialize( const T& t,
         BOOST_DEDUCED_TYPENAME boost::enable_if<
-            BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 )
+            BOOST_DEDUCED_TYPENAME detail::is_serializable< T > >::type* = 0 )
     {
         std::stringstream s;
         static_cast< std::ostream& >( s ) << std::boolalpha << t;
@@ -59,7 +59,7 @@ namespace detail
     template< typename T >
     std::string serialize( const T&,
         BOOST_DEDUCED_TYPENAME boost::disable_if<
-            BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 )
+            BOOST_DEDUCED_TYPENAME detail::is_serializable< T > >::type* = 0 )
     {
         return "?";
     }
diff --git a/src/libraries/turtle/is_functor.hpp b/src/libraries/turtle/is_functor.hpp
index e3b898b..e7e8296 100644
--- a/src/libraries/turtle/is_functor.hpp
+++ b/src/libraries/turtle/is_functor.hpp
@@ -36,14 +36,13 @@ namespace detail
 
     template< typename T >
     struct is_functor
-    {
-        typedef BOOST_DEDUCED_TYPENAME boost::mpl::or_<
-                    boost::function_types::is_callable_builtin< T >,
-                    has_result_type< T >,
-                    has_result< T >,
-                    has_sig< T >
-                >::type type;
-    };
+        : boost::mpl::or_<
+            boost::function_types::is_callable_builtin< T >,
+            has_result_type< T >,
+            has_result< T >,
+            has_sig< T >
+        >
+    {};
 }
 }