diff --git a/turtle/detail/expectation_template.hpp b/turtle/detail/expectation_template.hpp
index 78a079f..596d3a7 100644
--- a/turtle/detail/expectation_template.hpp
+++ b/turtle/detail/expectation_template.hpp
@@ -46,8 +46,8 @@ namespace detail
 {
     template< typename Signature > class expectation;
 
-    template< typename R BOOST_PP_COMMA_IF(MOCK_NUM_ARGS)
-        BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename T) >
+    template< typename R
+        BOOST_PP_ENUM_TRAILING_PARAMS(MOCK_NUM_ARGS, typename T) >
     class expectation< R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) >
         : public expectation_base
         , public action< R, R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) >
diff --git a/turtle/detail/function_impl_template.hpp b/turtle/detail/function_impl_template.hpp
index 848706e..ed48581 100644
--- a/turtle/detail/function_impl_template.hpp
+++ b/turtle/detail/function_impl_template.hpp
@@ -30,8 +30,8 @@ namespace detail
 {
     template< typename Signature > class function_impl;
 
-    template< typename R BOOST_PP_COMMA_IF(MOCK_NUM_ARGS)
-        BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename T) >
+    template< typename R
+        BOOST_PP_ENUM_TRAILING_PARAMS(MOCK_NUM_ARGS, typename T) >
     class function_impl< R ( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) ) >
         : public verifiable, public boost::enable_shared_from_this<
             function_impl< R ( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) )> >
diff --git a/turtle/detail/function_template.hpp b/turtle/detail/function_template.hpp
index 8ce331c..52062e1 100644
--- a/turtle/detail/function_template.hpp
+++ b/turtle/detail/function_template.hpp
@@ -21,8 +21,8 @@ namespace detail
 {
     template< typename Signature > class function;
 
-    template< typename R BOOST_PP_COMMA_IF(MOCK_NUM_ARGS)
-        BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename T) >
+    template< typename R
+        BOOST_PP_ENUM_TRAILING_PARAMS(MOCK_NUM_ARGS, typename T) >
     class function< R ( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) ) >
     {
     public: