diff --git a/include/boost/fusion/algorithm/iteration/detail/fold.hpp b/include/boost/fusion/algorithm/iteration/detail/fold.hpp
index 00161d99..afa99026 100644
--- a/include/boost/fusion/algorithm/iteration/detail/fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/fold.hpp
@@ -57,39 +57,11 @@ namespace boost { namespace fusion
         template<typename Result,int N>
         struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)
         {
-            template<typename State, typename It0, typename F>
+            template<typename State3, typename It3, typename F>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
-            call(State const& state,It0 const& it0,F f)
+            call_3(State3 const& state3,It3 const& it3,F& f)
             {
-                typedef typename
-                    result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0);
-                typedef typename
-                    result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it1);
-                typedef typename
-                    result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
-                        It2
-                    >::type
-                It3;
-                It3 it3 = fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it2);
-
-                typedef typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<State,It0,F>::type State1;
-                State1 const state1=f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0));
-
-                typedef typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<State1,It1,F>::type State2;
-                State2 const state2=f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1));
-
-                typedef typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<State2,It2,F>::type State3;
-                State3 const state3=f(state2,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it2));
-
                 return BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<
                     Result
                   , N-4
@@ -98,54 +70,95 @@ namespace boost { namespace fusion
                     fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it3),
                     f);
             }
-        };
 
-        template<typename Result>
-        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,3>
-        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it2)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it2),
+                    f);
+            }
+
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it1),
+                    f);
+            }
+
             template<typename State, typename It0, typename F>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename
-                    result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0);
-                typedef typename
-                    result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it1);
-
-                typedef typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<State,It0,F>::type State1;
-                State1 const state1=f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0));
-
-                typedef typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<State1,It1,F>::type State2;
-                State2 const state2=f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1));
+                return call_1(
+                    f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0),
+                    f);
+            }
+        };
 
+        template<typename Result>
+        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
                 return f(state2,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it2));
             }
+
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it1),
+                    f);
+            }
+
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0),
+                    f);
+            }
         };
 
         template<typename Result>
         struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,2>
         {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1));
+            }
+
             template<typename State, typename It0, typename F>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<State,It0,F>::type State1;
-                State1 const state1=f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0));
-
-                return f(
-                    state1,
-                    BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(
-                        fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0)));
+                return call_1(
+                    f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0),
+                    f);
             }
         };
 
diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
index 434c9d66..5456a0d7 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
@@ -23,35 +23,11 @@ namespace boost { namespace fusion
         template<typename Result,int N>
         struct unrolled_fold
         {
-            template<typename State, typename It0, typename F>
+            template<typename State3, typename It3, typename F>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
-            call(State const& state,It0 const& it0,F f)
+            call_3(State3 const& state3,It3 const& it3,F& f)
             {
-                typedef typename
-                    result_of::next<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::next(it0);
-                typedef typename
-                    result_of::next<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::next(it1);
-                typedef typename
-                    result_of::next<
-                        It2
-                    >::type
-                It3;
-                It3 it3 = fusion::next(it2);
-                typedef typename fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,fusion::deref(it0));
-                typedef typename fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,fusion::deref(it1));
-                typedef typename fold_lvalue_state<State2,It2,F>::type State3;
-                State3 const state3=f(state2,fusion::deref(it2));
                 return unrolled_fold<
                     Result
                   , N-4
@@ -60,47 +36,87 @@ namespace boost { namespace fusion
                     fusion::next(it3),
                     f);
             }
-        };
-        template<typename Result>
-        struct unrolled_fold<Result,3>
-        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,fusion::deref(it2)),
+                    fusion::next(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::next(it1),
+                    f);
+            }
             template<typename State, typename It0, typename F>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename
-                    result_of::next<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::next(it0);
-                typedef typename
-                    result_of::next<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::next(it1);
-                typedef typename fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,fusion::deref(it0));
-                typedef typename fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,fusion::deref(it1));
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::next(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_fold<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
                 return f(state2,fusion::deref(it2));
             }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::next(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::next(it0),
+                    f);
+            }
         };
         template<typename Result>
         struct unrolled_fold<Result,2>
         {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,fusion::deref(it1));
+            }
             template<typename State, typename It0, typename F>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,fusion::deref(it0));
-                return f(
-                    state1,
-                    fusion::deref( fusion::next(it0)));
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::next(it0),
+                    f);
             }
         };
         template<typename Result>
diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
index 1211550d..b86847ee 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
@@ -22,35 +22,11 @@ namespace boost { namespace fusion
         template<typename Result,int N>
         struct unrolled_iter_fold
         {
-            template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
-            call(State const& state,It0 const& it0,F f)
+            call_3(State3 const& state3,It3 const& it3,F& f)
             {
-                typedef typename
-                    result_of::next<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::next(it0);
-                typedef typename
-                    result_of::next<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::next(it1);
-                typedef typename
-                    result_of::next<
-                        It2
-                    >::type
-                It3;
-                It3 it3 = fusion::next(it2);
-                typedef typename iter_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,it0);
-                typedef typename iter_fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,it1);
-                typedef typename iter_fold_lvalue_state<State2,It2,F>::type State3;
-                State3 const state3=f(state2,it2);
                 return unrolled_iter_fold<
                     Result
                   , N-4
@@ -59,54 +35,94 @@ namespace boost { namespace fusion
                     fusion::next(it3),
                     f);
             }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,it2),
+                    fusion::next(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::next(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::next(it0),
+                    f);
+            }
         };
         template<typename Result>
         struct unrolled_iter_fold<Result,3>
         {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,it2);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::next(it1),
+                    f);
+            }
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename
-                    result_of::next<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::next(it0);
-                typedef typename
-                    result_of::next<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::next(it1);
-                typedef typename iter_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,it0);
-                typedef typename iter_fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,it1);
-                return f(state2,it2);
+                return call_1(
+                    f(state,it0),
+                    fusion::next(it0),
+                    f);
             }
         };
         template<typename Result>
         struct unrolled_iter_fold<Result,2>
         {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,it1);
+            }
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename iter_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,it0);
-                return f(
-                    state1,
-                    fusion::next(it0));
+                return call_1(
+                    f(state,it0),
+                    fusion::next(it0),
+                    f);
             }
         };
         template<typename Result>
         struct unrolled_iter_fold<Result,1>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -118,7 +134,7 @@ namespace boost { namespace fusion
         struct unrolled_iter_fold<Result,0>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const&, F)
             {
@@ -281,7 +297,7 @@ namespace boost { namespace fusion
                   , SeqSize
                 >::type
             type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(StateRef state, Seq& seq, F f)
             {
@@ -301,7 +317,7 @@ namespace boost { namespace fusion
         struct iter_fold_impl<0,StateRef,Seq,F>
         {
             typedef StateRef type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static StateRef
             call(StateRef state, Seq&, F)
             {
@@ -333,7 +349,7 @@ namespace boost { namespace fusion
         {};
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq
       , State const
@@ -347,7 +363,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq const
       , State const
@@ -361,7 +377,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq
       , State const
@@ -375,7 +391,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
index cc78231a..95122c8e 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
@@ -22,35 +22,11 @@ namespace boost { namespace fusion
         template<typename Result,int N>
         struct unrolled_reverse_fold
         {
-            template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
-            call(State const& state,It0 const& it0,F f)
+            call_3(State3 const& state3,It3 const& it3,F& f)
             {
-                typedef typename
-                    result_of::prior<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::prior(it0);
-                typedef typename
-                    result_of::prior<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::prior(it1);
-                typedef typename
-                    result_of::prior<
-                        It2
-                    >::type
-                It3;
-                It3 it3 = fusion::prior(it2);
-                typedef typename reverse_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,fusion::deref(it0));
-                typedef typename reverse_fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,fusion::deref(it1));
-                typedef typename reverse_fold_lvalue_state<State2,It2,F>::type State3;
-                State3 const state3=f(state2,fusion::deref(it2));
                 return unrolled_reverse_fold<
                     Result
                   , N-4
@@ -59,54 +35,94 @@ namespace boost { namespace fusion
                     fusion::prior(it3),
                     f);
             }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,fusion::deref(it2)),
+                    fusion::prior(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::prior(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::prior(it0),
+                    f);
+            }
         };
         template<typename Result>
         struct unrolled_reverse_fold<Result,3>
         {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,fusion::deref(it2));
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::prior(it1),
+                    f);
+            }
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename
-                    result_of::prior<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::prior(it0);
-                typedef typename
-                    result_of::prior<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::prior(it1);
-                typedef typename reverse_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,fusion::deref(it0));
-                typedef typename reverse_fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,fusion::deref(it1));
-                return f(state2,fusion::deref(it2));
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::prior(it0),
+                    f);
             }
         };
         template<typename Result>
         struct unrolled_reverse_fold<Result,2>
         {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,fusion::deref(it1));
+            }
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename reverse_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,fusion::deref(it0));
-                return f(
-                    state1,
-                    fusion::deref( fusion::prior(it0)));
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::prior(it0),
+                    f);
             }
         };
         template<typename Result>
         struct unrolled_reverse_fold<Result,1>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -118,7 +134,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_fold<Result,0>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const&, F)
             {
@@ -281,7 +297,7 @@ namespace boost { namespace fusion
                   , SeqSize
                 >::type
             type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(StateRef state, Seq& seq, F f)
             {
@@ -301,7 +317,7 @@ namespace boost { namespace fusion
         struct reverse_fold_impl<0,StateRef,Seq,F>
         {
             typedef StateRef type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static StateRef
             call(StateRef state, Seq&, F)
             {
@@ -333,7 +349,7 @@ namespace boost { namespace fusion
         {};
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq
       , State const
@@ -347,7 +363,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq const
       , State const
@@ -361,7 +377,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq
       , State const
@@ -375,7 +391,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
index 3023a912..3dc434fc 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
@@ -22,35 +22,11 @@ namespace boost { namespace fusion
         template<typename Result,int N>
         struct unrolled_reverse_iter_fold
         {
-            template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
-            call(State const& state,It0 const& it0,F f)
+            call_3(State3 const& state3,It3 const& it3,F& f)
             {
-                typedef typename
-                    result_of::prior<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::prior(it0);
-                typedef typename
-                    result_of::prior<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::prior(it1);
-                typedef typename
-                    result_of::prior<
-                        It2
-                    >::type
-                It3;
-                It3 it3 = fusion::prior(it2);
-                typedef typename reverse_iter_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,it0);
-                typedef typename reverse_iter_fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,it1);
-                typedef typename reverse_iter_fold_lvalue_state<State2,It2,F>::type State3;
-                State3 const state3=f(state2,it2);
                 return unrolled_reverse_iter_fold<
                     Result
                   , N-4
@@ -59,54 +35,94 @@ namespace boost { namespace fusion
                     fusion::prior(it3),
                     f);
             }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,it2),
+                    fusion::prior(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::prior(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::prior(it0),
+                    f);
+            }
         };
         template<typename Result>
         struct unrolled_reverse_iter_fold<Result,3>
         {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,it2);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::prior(it1),
+                    f);
+            }
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename
-                    result_of::prior<
-                        It0 const
-                    >::type
-                It1;
-                It1 it1 = fusion::prior(it0);
-                typedef typename
-                    result_of::prior<
-                        It1
-                    >::type
-                It2;
-                It2 it2 = fusion::prior(it1);
-                typedef typename reverse_iter_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,it0);
-                typedef typename reverse_iter_fold_lvalue_state<State1,It1,F>::type State2;
-                State2 const state2=f(state1,it1);
-                return f(state2,it2);
+                return call_1(
+                    f(state,it0),
+                    fusion::prior(it0),
+                    f);
             }
         };
         template<typename Result>
         struct unrolled_reverse_iter_fold<Result,2>
         {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,it1);
+            }
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
-                typedef typename reverse_iter_fold_lvalue_state<State,It0,F>::type State1;
-                State1 const state1=f(state,it0);
-                return f(
-                    state1,
-                    fusion::prior(it0));
+                return call_1(
+                    f(state,it0),
+                    fusion::prior(it0),
+                    f);
             }
         };
         template<typename Result>
         struct unrolled_reverse_iter_fold<Result,1>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -118,7 +134,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_iter_fold<Result,0>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const&, F)
             {
@@ -281,7 +297,7 @@ namespace boost { namespace fusion
                   , SeqSize
                 >::type
             type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(StateRef state, Seq& seq, F f)
             {
@@ -301,7 +317,7 @@ namespace boost { namespace fusion
         struct reverse_iter_fold_impl<0,StateRef,Seq,F>
         {
             typedef StateRef type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static StateRef
             call(StateRef state, Seq&, F)
             {
@@ -333,7 +349,7 @@ namespace boost { namespace fusion
         {};
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq
       , State const
@@ -347,7 +363,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq const
       , State const
@@ -361,7 +377,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq
       , State const
@@ -375,7 +391,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp b/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
index 8e4898ba..84aabfde 100644
--- a/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
@@ -17,7 +17,7 @@ namespace boost { namespace fusion
     }
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::iter_fold<
         Seq
       , State const
@@ -26,7 +26,7 @@ namespace boost { namespace fusion
     iter_fold(Seq& seq, State const& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::iter_fold<
         Seq const
       , State const
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
     iter_fold(Seq const& seq, State const& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::iter_fold<
         Seq
       , State const
@@ -44,7 +44,7 @@ namespace boost { namespace fusion
     iter_fold(Seq& seq, State& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::iter_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp b/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
index c5596e79..82fad70a 100644
--- a/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
@@ -17,7 +17,7 @@ namespace boost { namespace fusion
     }
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_fold<
         Seq
       , State const
@@ -26,7 +26,7 @@ namespace boost { namespace fusion
     reverse_fold(Seq& seq, State const& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_fold<
         Seq const
       , State const
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
     reverse_fold(Seq const& seq, State const& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_fold<
         Seq
       , State const
@@ -44,7 +44,7 @@ namespace boost { namespace fusion
     reverse_fold(Seq& seq, State& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp b/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
index 7b49ea69..9f002419 100644
--- a/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
@@ -17,7 +17,7 @@ namespace boost { namespace fusion
     }
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_iter_fold<
         Seq
       , State const
@@ -26,7 +26,7 @@ namespace boost { namespace fusion
     reverse_iter_fold(Seq& seq, State const& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_iter_fold<
         Seq const
       , State const
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
     reverse_iter_fold(Seq const& seq, State const& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_iter_fold<
         Seq
       , State const
@@ -44,7 +44,7 @@ namespace boost { namespace fusion
     reverse_iter_fold(Seq& seq, State& state, F f);
 
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::reverse_iter_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/sequence/intrinsic/swap.hpp b/include/boost/fusion/sequence/intrinsic/swap.hpp
index 4debbf78..6eca3146 100644
--- a/include/boost/fusion/sequence/intrinsic/swap.hpp
+++ b/include/boost/fusion/sequence/intrinsic/swap.hpp
@@ -40,7 +40,7 @@ namespace boost { namespace fusion {
             };
 
             template<typename Elem>
-            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             void operator()(Elem const& e) const
             {
                 using std::swap;
@@ -50,8 +50,8 @@ namespace boost { namespace fusion {
     }
 
     template<typename Seq1, typename Seq2>
-    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    typename enable_if<mpl::and_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >, void>::type 
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    typename enable_if<mpl::and_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >, void>::type
     swap(Seq1& lhs, Seq2& rhs)
     {
         typedef vector<Seq1&, Seq2&> references;
diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg
index 35a6881a..3cde502f 100644
--- a/preprocess/wave.cfg
+++ b/preprocess/wave.cfg
@@ -10,6 +10,8 @@
 -D_M_IX86
 -NBOOST_STATIC_ASSERT
 -NBOOST_FORCEINLINE
+-NBOOST_CONSTEXPR
+-NBOOST_CXX14_CONSTEXPR
 -NBOOST_MPL_ASSERT
 -NBOOST_MPL_ASSERT_MSG
 -NBOOST_MPL_ASSERT_RELATION