diff --git a/include/boost/mpl/key_type.hpp b/include/boost/mpl/key_type.hpp
index f129fc8..b986a2a 100644
--- a/include/boost/mpl/key_type.hpp
+++ b/include/boost/mpl/key_type.hpp
@@ -17,6 +17,7 @@
 
 #include <boost/mpl/key_type_fwd.hpp>
 #include <boost/mpl/sequence_tag.hpp>
+#include <boost/mpl/apply_wrap.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
 
@@ -27,22 +28,15 @@ template<
     , typename BOOST_MPL_AUX_NA_PARAM(T)
     >
 struct key_type
-    : key_type_impl< typename sequence_tag<AssociativeSequence>::type >
-        ::template apply<AssociativeSequence,T>
+    : apply_wrap2< 
+          key_type_impl< typename sequence_tag<AssociativeSequence>::type >
+        , AssociativeSequence, T>
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(2,key_type,(AssociativeSequence,T))
 };
 
 BOOST_MPL_AUX_NA_SPEC(2, key_type)
 
-#if BOOST_MPL_CFG_MSVC_60_ETI_BUG
-template<>
-struct key_type<int, int>
-{
-    typedef int type;
-};
-#endif
-
 }}
 
 #endif // BOOST_MPL_KEY_TYPE_HPP_INCLUDED
diff --git a/include/boost/mpl/value_type.hpp b/include/boost/mpl/value_type.hpp
index ffcf59d..5509688 100755
--- a/include/boost/mpl/value_type.hpp
+++ b/include/boost/mpl/value_type.hpp
@@ -17,6 +17,7 @@
 
 #include <boost/mpl/value_type_fwd.hpp>
 #include <boost/mpl/sequence_tag.hpp>
+#include <boost/mpl/apply_wrap.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
 
@@ -27,22 +28,14 @@ template<
     , typename BOOST_MPL_AUX_NA_PARAM(T)
     >
 struct value_type
-    : value_type_impl< typename sequence_tag<AssociativeSequence>::type >
-        ::template apply<AssociativeSequence,T>
+    : apply_wrap2<
+          value_type_impl< typename sequence_tag<AssociativeSequence>::type >
+        , AssociativeSequence, T >
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(2,value_type,(AssociativeSequence,T))
 };
 
 BOOST_MPL_AUX_NA_SPEC(2, value_type)
-
-#if BOOST_MPL_CFG_MSVC_60_ETI_BUG
-template<>
-struct value_type<int, int>
-{
-    typedef int type;
-};
-#endif
-
     
 }}