diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs
index f86a157e..cd522bd6 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs
@@ -20,7 +20,6 @@
 
 using System;
 using System.Reflection;
-using Spring.Objects.Factory.Support;
 
 namespace Spring.Objects.Factory.Config {
 
@@ -38,7 +37,7 @@ namespace Spring.Objects.Factory.Config {
 	/// injection.
 	/// </para>
 	/// <para>
-	/// NOTE: This interface is a special purpose interface, mainly for internal use within the framework.
+	/// This interface is a special purpose interface, mainly for internal use within the framework.
 	/// It is recommended to implement the plain <see cref="IObjectPostProcessor"/> interface as far as 
 	/// possible, or to derive from <see cref="IInstantiationAwareObjectPostProcessor"/> in order to be shielded
 	/// from extension to this interface.
@@ -90,7 +89,7 @@ namespace Spring.Objects.Factory.Config {
 		/// In the case of any errors.
 		/// </exception>
 		/// <seealso cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
-		/// <seealso cref="IConfigurableObjectDefinition.FactoryMethodName"/>
+		/// <seealso cref="Spring.Objects.Factory.Support.IConfigurableObjectDefinition.FactoryMethodName"/>
 		object PostProcessBeforeInstantiation(Type objectType, string objectName);
 
 
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IManagedCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs
similarity index 99%
rename from src/Spring/Spring.Core/Objects/Factory/Support/IManagedCollection.cs
rename to src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs
index a79e3a88..d6d12dd4 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/IManagedCollection.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs
@@ -26,7 +26,7 @@ using Spring.Objects.Factory.Config;
 
 #endregion
 
-namespace Spring.Objects.Factory.Support
+namespace Spring.Objects.Factory.Config
 {
 	/// <summary>
 	/// Denotes a special placeholder collection that may contain
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs
index c486a046..73afedf4 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs
@@ -21,7 +21,6 @@
 #region Imports
 
 using System;
-using Spring.Objects.Factory.Support;
 
 #endregion
 
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs b/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs
index c4301563..7f18da6a 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs
@@ -20,7 +20,6 @@
 
 using System;
 using System.Reflection;
-using Spring.Objects.Factory.Support;
 
 namespace Spring.Objects.Factory.Config
 {
@@ -114,7 +113,7 @@ namespace Spring.Objects.Factory.Config
         /// In the case of any errors.
         /// </exception>
         /// <seealso cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
-        /// <seealso cref="IConfigurableObjectDefinition.FactoryMethodName"/>
+        /// <seealso cref="Spring.Objects.Factory.Support.IConfigurableObjectDefinition.FactoryMethodName"/>
         public virtual object PostProcessBeforeInstantiation(Type objectType, string objectName)
         {
             return null;
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedDictionary.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs
similarity index 97%
rename from src/Spring/Spring.Core/Objects/Factory/Support/ManagedDictionary.cs
rename to src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs
index ca8bb81c..81f4787e 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedDictionary.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs
@@ -36,7 +36,7 @@ using Spring.Util;
 
 #endregion
 
-namespace Spring.Objects.Factory.Support
+namespace Spring.Objects.Factory.Config
 {
 	/// <summary>
 	/// Tag subclass used to hold a dictionary of managed elements.
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedList.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs
similarity index 96%
rename from src/Spring/Spring.Core/Objects/Factory/Support/ManagedList.cs
rename to src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs
index c253a975..35970cbb 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedList.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs
@@ -30,12 +30,11 @@ using System.Globalization;
 using Spring.Core;
 using Spring.Core.TypeConversion;
 using Spring.Core.TypeResolution;
-using Spring.Objects.Factory.Config;
 using Spring.Util;
 
 #endregion
 
-namespace Spring.Objects.Factory.Support
+namespace Spring.Objects.Factory.Config
 {
     /// <summary>
     /// Tag subclass used to hold a list of managed elements.
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedNameValueCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs
similarity index 96%
rename from src/Spring/Spring.Core/Objects/Factory/Support/ManagedNameValueCollection.cs
rename to src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs
index fa68adee..b532bb93 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedNameValueCollection.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs
@@ -19,10 +19,9 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Specialized;
 
-namespace Spring.Objects.Factory.Support
+namespace Spring.Objects.Factory.Config
 {
     /// <summary>
     /// Tag class which represent a Spring-managed <see cref="NameValueCollection"/> instance that
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedSet.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs
similarity index 97%
rename from src/Spring/Spring.Core/Objects/Factory/Support/ManagedSet.cs
rename to src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs
index 5f2d4e77..caf29838 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedSet.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs
@@ -26,13 +26,12 @@ using System.Collections;
 using Spring.Collections;
 using Spring.Core;
 using Spring.Core.TypeConversion;
-using Spring.Core.TypeResolution;
-using Spring.Objects.Factory.Config;
+using Spring.Core.TypeResolution;
 using Spring.Util;
 
 #endregion
 
-namespace Spring.Objects.Factory.Support
+namespace Spring.Objects.Factory.Config
 {
     /// <summary>
     /// Tag subclass used to hold a set of managed elements.
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs
index 7c50ddc2..cb632868 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs
@@ -26,7 +26,6 @@ using System.Collections.Specialized;
 
 using Spring.Collections;
 using Spring.Util;
-using Spring.Objects.Factory.Support;
 
 #endregion
 
@@ -55,6 +54,7 @@ namespace Spring.Objects.Factory.Config
         /// <param name="resolveHandler">The handler to be called for resolving variables contained in a string.</param>
         public ObjectDefinitionVisitor(ResolveHandler resolveHandler)
         {
+            AssertUtils.ArgumentNotNull(resolveHandler, "ResovleHandler");
             this.resolveHandler = resolveHandler;
         }
 
@@ -248,7 +248,7 @@ namespace Spring.Objects.Factory.Config
         /// calls <see cref="ResolveValue"/> for list element.
         /// </summary>
         protected virtual void VisitManagedList(ManagedList listVal)
-        {
+        {            
             string elementTypeName = listVal.ElementTypeName;
             if (elementTypeName != null)
             {
diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj
index ad06027b..b5a6d191 100644
--- a/src/Spring/Spring.Core/Spring.Core.2008.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2008.csproj
@@ -693,7 +693,7 @@
     <Compile Include="Objects\Factory\Support\DefaultObjectNameGenerator.cs" />
     <Compile Include="Objects\Factory\Support\IConfigurableObjectDefinition.cs" />
     <Compile Include="Objects\Factory\Support\IObjectNameGenerator.cs" />
-    <Compile Include="Objects\Factory\Support\ManagedNameValueCollection.cs" />
+    <Compile Include="Objects\Factory\Config\ManagedNameValueCollection.cs" />
     <Compile Include="Objects\Factory\Support\ObjectDefinitionBuilder.cs" />
     <Compile Include="Objects\Factory\Support\ObjectDefinitionValueResolver.cs" />
     <Compile Include="Objects\Factory\Support\SimpleAutowireCandidateResolver.cs" />
@@ -918,7 +918,7 @@
     <Compile Include="Objects\Factory\Support\IInstantiationStrategy.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Objects\Factory\Support\IManagedCollection.cs">
+    <Compile Include="Objects\Factory\Config\IManagedCollection.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Objects\Factory\Support\IMethodReplacer.cs">
@@ -936,13 +936,13 @@
     <Compile Include="Objects\Factory\Support\LookupMethodReplacer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Objects\Factory\Support\ManagedDictionary.cs">
+    <Compile Include="Objects\Factory\Config\ManagedDictionary.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Objects\Factory\Support\ManagedList.cs">
+    <Compile Include="Objects\Factory\Config\ManagedList.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Objects\Factory\Support\ManagedSet.cs">
+    <Compile Include="Objects\Factory\Config\ManagedSet.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs">
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs
index 34b8c7e8..182a4d3a 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs
@@ -18,6 +18,7 @@
 
 #endregion
 
+using System;
 using System.Collections;
 using System.Collections.Specialized;
 using NUnit.Framework;
@@ -50,6 +51,13 @@ namespace Spring.Objects.Factory.Config
             return rawText;
         }
 
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void BadConstructorCall()
+        {
+            ObjectDefinitionVisitor visitor = new ObjectDefinitionVisitor(null);
+        }
+
         [Test]
         public void VisitObjectTypeName()
         {
@@ -89,6 +97,8 @@ namespace Spring.Objects.Factory.Config
 
             ManagedList list = od.PropertyValues.GetPropertyValue("PropertyName").Value as ManagedList;
 
+            Assert.IsNotNull(list, "Property value is not of type ManagedList.  Type = [" +
+                od.PropertyValues.GetPropertyValue("PropertyName").Value.GetType() + "]");
             Assert.AreEqual("Value", list.ElementTypeName);
             Assert.AreEqual("Value", list[0]);
         }
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs
index b9f1d83a..7740d61f 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedListTests.cs
@@ -21,6 +21,7 @@
 using System;
 using System.Collections;
 using NUnit.Framework;
+using Spring.Objects.Factory.Config;
 
 namespace Spring.Objects.Factory.Support
 {
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs
index c5819cfd..b2271b7a 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedNameValueCollectionTests.cs
@@ -22,6 +22,7 @@ using System;
 using System.Collections;
 using System.Collections.Specialized;
 using NUnit.Framework;
+using Spring.Objects.Factory.Config;
 
 namespace Spring.Objects.Factory.Support
 {
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs
index ad3e62b7..654b18d8 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedSetTests.cs
@@ -22,6 +22,7 @@ using System;
 using System.Collections;
 using NUnit.Framework;
 using Spring.Collections;
+using Spring.Objects.Factory.Config;
 
 namespace Spring.Objects.Factory.Support
 {