diff --git a/include/boost/phoenix/core/is_nullary.hpp b/include/boost/phoenix/core/is_nullary.hpp
index 347122c..0cf142e 100644
--- a/include/boost/phoenix/core/is_nullary.hpp
+++ b/include/boost/phoenix/core/is_nullary.hpp
@@ -138,7 +138,7 @@ namespace boost { namespace phoenix
             : is_nullary<T>
         {};
 
-#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+      //#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
         template <typename T>
         struct is_nullary<custom_terminal<T>,
         typename custom_terminal<T>::_is_default_custom_terminal >
@@ -174,13 +174,13 @@ namespace boost { namespace phoenix
             : mpl::true_
         {};
       */
-#else
+      /*#else
         template <typename T>
         struct is_nullary<custom_terminal<T> >
             : mpl::true_
         {};
-#endif
-
+        #endif
+      */
         template <typename T>
         struct is_nullary<custom_terminal<actor<T> > >
             : evaluator
diff --git a/include/boost/phoenix/core/nothing.hpp b/include/boost/phoenix/core/nothing.hpp
index 8602b8c..e426006 100644
--- a/include/boost/phoenix/core/nothing.hpp
+++ b/include/boost/phoenix/core/nothing.hpp
@@ -45,9 +45,9 @@ namespace boost { namespace phoenix
     struct custom_terminal<detail::nothing, Dummy>
     {
         typedef void result_type;
-#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+      //#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
         typedef void _is_nothing_custom_terminal; // fix for #7730
-#endif
+      //#endif
         template <typename Context>
         void operator()(detail::nothing, Context &) const
         {
diff --git a/include/boost/phoenix/core/reference.hpp b/include/boost/phoenix/core/reference.hpp
index cc0f942..4ce05a6 100644
--- a/include/boost/phoenix/core/reference.hpp
+++ b/include/boost/phoenix/core/reference.hpp
@@ -90,9 +90,9 @@ namespace boost { namespace phoenix
     struct custom_terminal<boost::reference_wrapper<T> >
     {
         typedef T &result_type;
-#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+      //#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
         typedef void _is_reference_custom_terminal; // fix for #7730
-#endif
+      //#endif
 
         template <typename Context>
         T &operator()(boost::reference_wrapper<T> r, Context &) const
diff --git a/include/boost/phoenix/core/terminal.hpp b/include/boost/phoenix/core/terminal.hpp
index 75f1497..e966a58 100644
--- a/include/boost/phoenix/core/terminal.hpp
+++ b/include/boost/phoenix/core/terminal.hpp
@@ -49,11 +49,11 @@ namespace boost { namespace phoenix
 
     template <typename T, typename Dummy>
     struct custom_terminal
-#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+    //#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
     {
       typedef void _is_default_custom_terminal; // fix for #7730
     }
-#endif
+    //#endif
       ;
 
     namespace tag {
diff --git a/include/boost/phoenix/scope/local_variable.hpp b/include/boost/phoenix/scope/local_variable.hpp
index 3b26c95..83d1df4 100644
--- a/include/boost/phoenix/scope/local_variable.hpp
+++ b/include/boost/phoenix/scope/local_variable.hpp
@@ -50,7 +50,7 @@ namespace boost { namespace phoenix
         {};
     }
 
-#ifdef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+  /*#ifdef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
     namespace result_of
     {
         template <typename Key>
@@ -58,8 +58,8 @@ namespace boost { namespace phoenix
             : mpl::false_
         {};
     }
-#endif
-
+    #endif
+  */
     namespace detail
     {
         struct scope_is_nullary_actions
@@ -95,9 +95,9 @@ namespace boost { namespace phoenix
     {
         template <typename Sig>
         struct result;
-#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+      //#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
         typedef void _is_local_var_custom_terminal; // fix for #7730
-#endif
+      //#endif
 
         template <typename This, typename Local, typename Context>
         struct result<This(Local, Context)>
diff --git a/include/boost/phoenix/statement/throw.hpp b/include/boost/phoenix/statement/throw.hpp
index c743500..0938b8e 100644
--- a/include/boost/phoenix/statement/throw.hpp
+++ b/include/boost/phoenix/statement/throw.hpp
@@ -90,9 +90,9 @@ namespace boost { namespace phoenix
     struct custom_terminal<detail::rethrow, Dummy>
     {
         typedef void result_type;
-#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+      //#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
         typedef void _is_throw_custom_terminal; // fix for #7730
-#endif
+      //#endif
 
         template <typename Context>
         void operator()(detail::rethrow, Context &) const