--- a/boost/parameter/aux_/arg_list.hpp	2008-03-22 14:45:55.000000000 -0700
+++ b/boost/parameter/aux_/arg_list.hpp	2009-05-14 13:16:48.000000000 -0700
@@ -211,9 +211,9 @@
     // Create a new list by prepending arg to a copy of tail.  Used
     // when incrementally building this structure with the comma
     // operator.
-    arg_list(TaggedArg arg, Next const& tail)
+    arg_list(TaggedArg in_arg, Next const& tail)
       : Next(tail)
-      , arg(arg)
+      , arg(in_arg)
     {}
 
     // A metafunction class that, given a keyword and a default
--- a/boost/parameter/aux_/maybe.hpp	2008-03-22 14:45:55.000000000 -0700
+++ b/boost/parameter/aux_/maybe.hpp	2009-05-14 13:16:03.000000000 -0700
@@ -33,8 +33,8 @@
         BOOST_DEDUCED_TYPENAME remove_reference<reference>::type
     >::type non_cv_value;
         
-    explicit maybe(T value)
-      : value(value)
+    explicit maybe(T in_value)
+      : value(in_value)
       , constructed(false)
     {}
 
@@ -48,23 +48,23 @@
             this->destroy();
     }
 
-    reference construct(reference value) const
+    reference construct(reference in_value) const
     {
-        return value;
+        return in_value;
     }
 
     template <class U>
-    reference construct2(U const& value) const
+    reference construct2(U const& in_value) const
     {
-        new (m_storage.bytes) non_cv_value(value);
+        new (m_storage.bytes) non_cv_value(in_value);
         constructed = true;
         return *(non_cv_value*)m_storage.bytes;
     }
 
     template <class U>
-    reference construct(U const& value) const
+    reference construct(U const& in_value) const
     {
-        return this->construct2(value);
+        return this->construct2(in_value);
     }
 
     void destroy()