diff --git a/src/Build.UnitTests/Collections/OMcollections_tests.cs b/src/Build.UnitTests/Collections/OMcollections_tests.cs
index 0421b05453d..a2c9c2ac165 100644
--- a/src/Build.UnitTests/Collections/OMcollections_tests.cs
+++ b/src/Build.UnitTests/Collections/OMcollections_tests.cs
@@ -16,6 +16,7 @@
 using Shouldly;
 using ObjectModel = System.Collections.ObjectModel;
 using Xunit;
+using Microsoft.Build.BackEnd;
 
 namespace Microsoft.Build.UnitTests.OM.Collections
 {
diff --git a/src/Build.UnitTests/Construction/ElementLocation_Tests.cs b/src/Build.UnitTests/Construction/ElementLocation_Tests.cs
index 43d62d5c4dd..dd48d7391e5 100644
--- a/src/Build.UnitTests/Construction/ElementLocation_Tests.cs
+++ b/src/Build.UnitTests/Construction/ElementLocation_Tests.cs
@@ -18,6 +18,7 @@
 using System.Reflection;
 using Xunit;
 using System.Text;
+using Microsoft.Build.BackEnd;
 
 namespace Microsoft.Build.UnitTests.Construction
 {
diff --git a/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs b/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs
index 88a009211a3..1611340705b 100644
--- a/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs
+++ b/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs
@@ -8,6 +8,7 @@
 using Microsoft.Build.Construction;
 using Microsoft.Build.UnitTests.BackEnd;
 using Xunit;
+using Microsoft.Build.BackEnd;
 
 namespace Microsoft.Build.UnitTests.OM.Instance
 {
diff --git a/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs b/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs
index ab9d4e89982..1f8544a3eb4 100644
--- a/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs
+++ b/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs
@@ -9,6 +9,7 @@
 using Microsoft.Build.Construction;
 using Microsoft.Build.UnitTests.BackEnd;
 using Xunit;
+using Microsoft.Build.BackEnd;
 
 namespace Microsoft.Build.UnitTests.OM.Instance
 {
diff --git a/src/Build.UnitTests/Instance/TaskItem_Tests.cs b/src/Build.UnitTests/Instance/TaskItem_Tests.cs
index 24110272103..e387e719ad6 100644
--- a/src/Build.UnitTests/Instance/TaskItem_Tests.cs
+++ b/src/Build.UnitTests/Instance/TaskItem_Tests.cs
@@ -13,6 +13,7 @@
 using Microsoft.Build.Framework;
 using System.IO;
 using Xunit;
+using Microsoft.Build.BackEnd;
 
 namespace Microsoft.Build.UnitTests.OM.Instance
 {
diff --git a/src/Build/BackEnd/BuildManager/RequestedProjectState.cs b/src/Build/BackEnd/BuildManager/RequestedProjectState.cs
index e0e300403cf..1df6a64b42b 100644
--- a/src/Build/BackEnd/BuildManager/RequestedProjectState.cs
+++ b/src/Build/BackEnd/BuildManager/RequestedProjectState.cs
@@ -44,12 +44,12 @@ private static IDictionary<string, List<string>> CreateItemMetadataDictionary(in
             return new Dictionary<string, List<string>>(capacity, StringComparer.OrdinalIgnoreCase);
         }
 
-        private static void TranslateMetadataForItem(ref List<string> list, ITranslator translator)
+        private static void TranslateMetadataForItem(ITranslator translator, ref List<string> list)
         {
             translator.Translate(ref list);
         }
 
-        private static void TranslateString(ref string s, ITranslator translator)
+        private static void TranslateString(ITranslator translator, ref string s)
         {
             translator.Translate(ref s);
         }
diff --git a/src/Build/BackEnd/Components/Caching/ConfigCache.cs b/src/Build/BackEnd/Components/Caching/ConfigCache.cs
index b6989894a6b..2645a3feba6 100644
--- a/src/Build/BackEnd/Components/Caching/ConfigCache.cs
+++ b/src/Build/BackEnd/Components/Caching/ConfigCache.cs
@@ -348,8 +348,8 @@ public void Translate(ITranslator translator)
         {
             translator.TranslateDictionary(
                 ref _configurations,
-                (ref int configId, ITranslator aTranslator) => aTranslator.Translate(ref configId),
-                (ref BuildRequestConfiguration configuration, ITranslator aTranslator) =>
+                (ITranslator aTranslator, ref int configId) => aTranslator.Translate(ref configId),
+                (ITranslator aTranslator, ref BuildRequestConfiguration configuration) =>
                 {
                     if (translator.Mode == TranslationDirection.WriteToStream)
                     {
@@ -365,8 +365,8 @@ public void Translate(ITranslator translator)
 
             translator.TranslateDictionary(
                 ref _configurationIdsByMetadata,
-                (ref ConfigurationMetadata configMetadata, ITranslator aTranslator) => aTranslator.Translate(ref configMetadata, ConfigurationMetadata.FactoryForDeserialization),
-                (ref int configId, ITranslator aTranslator) => aTranslator.Translate(ref configId),
+                (ITranslator aTranslator, ref ConfigurationMetadata configMetadata) => aTranslator.Translate(ref configMetadata, ConfigurationMetadata.FactoryForDeserialization),
+                (ITranslator aTranslator, ref int configId) => aTranslator.Translate(ref configId),
                 capacity => new Dictionary<ConfigurationMetadata, int>(capacity));
         }
 
diff --git a/src/Build/BackEnd/Components/Caching/ResultsCache.cs b/src/Build/BackEnd/Components/Caching/ResultsCache.cs
index 36e1a24824e..64db389a8ed 100644
--- a/src/Build/BackEnd/Components/Caching/ResultsCache.cs
+++ b/src/Build/BackEnd/Components/Caching/ResultsCache.cs
@@ -243,8 +243,8 @@ public void Translate(ITranslator translator)
 
             translator.TranslateDictionary(
                 ref localReference,
-                (ref int i, ITranslator aTranslator) => aTranslator.Translate(ref i),
-                (ref BuildResult result, ITranslator aTranslator) => aTranslator.Translate(ref result),
+                (ITranslator aTranslator, ref int i) => aTranslator.Translate(ref i),
+                (ITranslator aTranslator, ref BuildResult result) => aTranslator.Translate(ref result),
                 capacity => new ConcurrentDictionary<int, BuildResult>(Environment.ProcessorCount, capacity));
 
             if (translator.Mode == TranslationDirection.ReadFromStream)
diff --git a/src/Build/Instance/ProjectInstance.cs b/src/Build/Instance/ProjectInstance.cs
index ac9d3200de3..992fac85f17 100644
--- a/src/Build/Instance/ProjectInstance.cs
+++ b/src/Build/Instance/ProjectInstance.cs
@@ -2045,13 +2045,13 @@ private void TranslateTargets(ITranslator translator)
         }
 
         // todo move to nested function after c#7
-        private static void TranslatorForTargetSpecificDictionaryKey(ref string key, ITranslator translator)
+        private static void TranslatorForTargetSpecificDictionaryKey(ITranslator translator, ref string key)
         {
             translator.Translate(ref key);
         }
 
         // todo move to nested function after c#7
-        private static void TranslatorForTargetSpecificDictionaryValue(ref List<TargetSpecification> value, ITranslator translator)
+        private static void TranslatorForTargetSpecificDictionaryValue(ITranslator translator, ref List<TargetSpecification> value)
         {
             translator.Translate(ref value, TargetSpecification.FactoryForDeserialization);
         }
diff --git a/src/Build/Instance/ProjectTaskInstance.cs b/src/Build/Instance/ProjectTaskInstance.cs
index 3c5a256de29..98b42dc76ce 100644
--- a/src/Build/Instance/ProjectTaskInstance.cs
+++ b/src/Build/Instance/ProjectTaskInstance.cs
@@ -390,12 +390,12 @@ void ITranslatable.Translate(ITranslator translator)
             }
         }
 
-        private static void ParametersKeyTranslator(ref string key, ITranslator translator)
+        private static void ParametersKeyTranslator(ITranslator translator, ref string key)
         {
             translator.Translate(ref key);
         }
 
-        private static void ParametersValueTranslator(ref (string, ElementLocation) value, ITranslator translator)
+        private static void ParametersValueTranslator(ITranslator translator, ref (string, ElementLocation) value)
         {
             if (translator.Mode == TranslationDirection.WriteToStream)
             {
diff --git a/src/Build/Instance/TaskRegistry.cs b/src/Build/Instance/TaskRegistry.cs
index 7a83bd9f59b..3d261b4cf46 100644
--- a/src/Build/Instance/TaskRegistry.cs
+++ b/src/Build/Instance/TaskRegistry.cs
@@ -1707,13 +1707,13 @@ public void Translate(ITranslator translator)
                 }
 
                 // todo move to nested function after C# 7
-                private static void TranslatorForTaskParametersKey(ref string key, ITranslator translator)
+                private static void TranslatorForTaskParametersKey(ITranslator translator, ref string key)
                 {
                     translator.Translate(ref key);
                 }
 
                 // todo move to nested function after C# 7
-                private static void TranslatorForTaskParameterValue(ref TaskPropertyInfo taskPropertyInfo, ITranslator translator)
+                private static void TranslatorForTaskParameterValue(ITranslator translator, ref TaskPropertyInfo taskPropertyInfo)
                 {
                     string name = null;
                     string propertyTypeName = null;
@@ -1783,13 +1783,13 @@ public void Translate(ITranslator translator)
         }
 
         //todo make nested after C# 7
-        void TranslateTaskRegistrationKey(ref RegisteredTaskIdentity taskIdentity, ITranslator translator)
+        void TranslateTaskRegistrationKey(ITranslator translator, ref RegisteredTaskIdentity taskIdentity)
         {
             translator.Translate(ref taskIdentity);
         }
 
         //todo make nested after C# 7
-        void TranslateTaskRegistrationValue(ref List<RegisteredTaskRecord> taskRecords, ITranslator translator)
+        void TranslateTaskRegistrationValue(ITranslator translator, ref List<RegisteredTaskRecord> taskRecords)
         {
             translator.Translate(ref taskRecords, RegisteredTaskRecord.FactoryForDeserialization);
         }
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
index c70ad9fc654..e848e45cf85 100644
--- a/src/Build/Microsoft.Build.csproj
+++ b/src/Build/Microsoft.Build.csproj
@@ -137,6 +137,7 @@
     </Compile>
     <Compile Include="..\Shared\TaskParameter.cs" />
     <Compile Include="..\Shared\TaskParameterTypeVerifier.cs" />
+    <Compile Include="..\Shared\TranslatorHelpers.cs" />
     <Compile Include="..\Shared\CommunicationsUtilities.cs" />
     <Compile Include="..\Shared\InterningBinaryReader.cs" />
     <Compile Include="..\Shared\TaskEngineAssemblyResolver.cs">
diff --git a/src/MSBuild/MSBuild.csproj b/src/MSBuild/MSBuild.csproj
index 75f5ca314aa..2be04303ffd 100644
--- a/src/MSBuild/MSBuild.csproj
+++ b/src/MSBuild/MSBuild.csproj
@@ -126,6 +126,7 @@
     <Compile Include="..\Shared\INodePacketHandler.cs" />
     <Compile Include="..\Shared\ITranslatable.cs" />
     <Compile Include="..\Shared\ITranslator.cs" />
+    <Compile Include="..\Shared\TranslatorHelpers.cs" />
     <Compile Include="..\Shared\BinaryTranslator.cs" />
     <Compile Include="..\Shared\CommunicationsUtilities.cs" />
     <Compile Include="..\Shared\InterningBinaryReader.cs" />
diff --git a/src/MSBuildTaskHost/MSBuildTaskHost.csproj b/src/MSBuildTaskHost/MSBuildTaskHost.csproj
index 2e10ebdd3fd..ade9f4d4b91 100644
--- a/src/MSBuildTaskHost/MSBuildTaskHost.csproj
+++ b/src/MSBuildTaskHost/MSBuildTaskHost.csproj
@@ -92,6 +92,7 @@
     <Compile Include="..\Shared\ITranslator.cs">
       <Link>ITranslator.cs</Link>
     </Compile>
+    <Compile Include="..\Shared\TranslatorHelpers.cs" />
     <Compile Include="..\Shared\InternalErrorException.cs">
       <Link>InternalErrorException.cs</Link>
     </Compile>
diff --git a/src/Shared/BinaryTranslator.cs b/src/Shared/BinaryTranslator.cs
index 3dce827846d..8456b3a6c21 100644
--- a/src/Shared/BinaryTranslator.cs
+++ b/src/Shared/BinaryTranslator.cs
@@ -264,14 +264,14 @@ public void Translate(ref List<string> list)
             /// <param name="list">The list to be translated.</param>
             /// <param name="factory">Factory to deserialize T</param>
             /// <typeparam name="T">TaskItem type</typeparam>
-            public void Translate<T>(ref List<T> list, NodePacketValueFactory<T> factory) where T : ITranslatable
+            public void Translate<T>(ref List<T> list, ObjectTranslator<T> objectTranslator)
             {
                 IList<T> listAsInterface = list;
-                Translate(ref listAsInterface, factory, count => new List<T>(count));
+                Translate(ref listAsInterface, objectTranslator, count => new List<T>(count));
                 list = (List<T>) listAsInterface;
             }
 
-            public void Translate<T, L>(ref IList<T> list, NodePacketValueFactory<T> factory, NodePacketCollectionCreator<L> collectionFactory) where T : ITranslatable where L : IList<T>
+            public void Translate<T, L>(ref IList<T> list, ObjectTranslator<T> objectTranslator, NodePacketCollectionCreator<L> collectionFactory) where L : IList<T>
             {
                 if (!TranslateNullable(list))
                 {
@@ -285,12 +285,7 @@ public void Translate<T, L>(ref IList<T> list, NodePacketValueFactory<T> factory
                 {
                     T value = default(T);
 
-                    if (!TranslateNullable(value))
-                    {
-                        continue;
-                    }
-
-                    value = factory(this);
+                    objectTranslator(this, ref value);
                     list.Add(value);
                 }
             }
@@ -444,24 +439,6 @@ public void Translate<T>(ref T value)
                 value.Translate(this);
             }
 
-            /// <summary>
-            /// Translates an object implementing INodePacketTranslatable which does not expose a
-            /// public parameterless constructor.
-            /// </summary>
-            /// <typeparam name="T">The reference type.</typeparam>
-            /// <param name="value">The value to be translated.</param>
-            /// <param name="factory">The factory method used to instantiate values of type T.</param>
-            public void Translate<T>(ref T value, NodePacketValueFactory<T> factory)
-                where T : ITranslatable
-            {
-                if (!TranslateNullable(value))
-                {
-                    return;
-                }
-
-                value = factory(this);
-            }
-
             /// <summary>
             /// Translates an array of objects implementing INodePacketTranslatable.
             /// </summary>
@@ -491,8 +468,7 @@ public void TranslateArray<T>(ref T[] array)
             /// <typeparam name="T">The reference type.</typeparam>
             /// <param name="array">The array to be translated.</param>
             /// <param name="factory">The factory method used to instantiate values of type T.</param>
-            public void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
-                where T : ITranslatable
+            public void TranslateArray<T>(ref T[] array, ObjectTranslator<T> objectTranslator)
             {
                 if (!TranslateNullable(array))
                 {
@@ -504,7 +480,7 @@ public void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
 
                 for (int i = 0; i < count; i++)
                 {
-                    array[i] = factory(this);
+                    objectTranslator(this, ref array[i]);
                 }
             }
 
@@ -546,8 +522,8 @@ public void TranslateDictionary(ref IDictionary<string, string> dictionary, Node
 
             public void TranslateDictionary<K, V>(
                 ref IDictionary<K, V> dictionary,
-                Translator<K> keyTranslator,
-                Translator<V> valueTranslator,
+                ObjectTranslator<K> keyTranslator,
+                ObjectTranslator<V> valueTranslator,
                 NodePacketCollectionCreator<IDictionary<K, V>> dictionaryCreator)
             {
                 if (!TranslateNullable(dictionary))
@@ -561,9 +537,9 @@ public void TranslateDictionary<K, V>(
                 for (int i = 0; i < count; i++)
                 {
                     K key = default(K);
-                    keyTranslator.Invoke(ref key, this);
+                    keyTranslator(this, ref key);
                     V value = default(V);
-                    valueTranslator(ref value, this);
+                    valueTranslator(this, ref value);
                     dictionary[key] = value;
                 }
             }
@@ -575,8 +551,8 @@ public void TranslateDictionary<K, V>(
             /// <param name="dictionary">The dictionary to be translated.</param>
             /// <param name="comparer">The comparer used to instantiate the dictionary.</param>
             /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
-            public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityComparer<string> comparer, NodePacketValueFactory<T> valueFactory)
-                where T : class, ITranslatable
+            public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityComparer<string> comparer, ObjectTranslator<T> objectTranslator)
+                where T : class
             {
                 if (!TranslateNullable(dictionary))
                 {
@@ -591,7 +567,7 @@ public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEquali
                     string key = null;
                     Translate(ref key);
                     T value = null;
-                    Translate(ref value, valueFactory);
+                    objectTranslator(this, ref value);
                     dictionary[key] = value;
                 }
             }
@@ -603,9 +579,9 @@ public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEquali
             /// <typeparam name="T">The reference type for values in the dictionary.</typeparam>
             /// <param name="dictionary">The dictionary to be translated.</param>
             /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
-            public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> valueFactory)
+            public void TranslateDictionary<D, T>(ref D dictionary, ObjectTranslator<T> objectTranslator)
                 where D : IDictionary<string, T>, new()
-                where T : class, ITranslatable
+                where T : class
             {
                 if (!TranslateNullable(dictionary))
                 {
@@ -620,7 +596,7 @@ public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T
                     string key = null;
                     Translate(ref key);
                     T value = null;
-                    Translate(ref value, valueFactory);
+                    objectTranslator(this, ref value);
                     dictionary[key] = value;
                 }
             }
@@ -633,9 +609,9 @@ public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T
             /// <param name="dictionary">The dictionary to be translated.</param>
             /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
             /// <param name="dictionaryCreator">The delegate used to instantiate the dictionary.</param>
-            public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> valueFactory, NodePacketCollectionCreator<D> dictionaryCreator)
+            public void TranslateDictionary<D, T>(ref D dictionary, ObjectTranslator<T> objectTranslator, NodePacketCollectionCreator<D> dictionaryCreator)
                 where D : IDictionary<string, T>
-                where T : class, ITranslatable
+                where T : class
             {
                 if (!TranslateNullable(dictionary))
                 {
@@ -650,7 +626,7 @@ public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T
                     string key = null;
                     Translate(ref key);
                     T value = null;
-                    Translate(ref value, valueFactory);
+                    objectTranslator(this, ref value);
                     dictionary[key] = value;
                 }
             }
@@ -863,7 +839,7 @@ public void Translate(ref HashSet<string> set)
             /// <param name="list">The list to be translated.</param>
             /// <param name="factory">factory to create type T</param>
             /// <typeparam name="T">A TaskItemType</typeparam>
-            public void Translate<T>(ref List<T> list, NodePacketValueFactory<T> factory) where T : ITranslatable
+            public void Translate<T>(ref List<T> list, ObjectTranslator<T> objectTranslator)
             {
                 if (!TranslateNullable(list))
                 {
@@ -876,7 +852,7 @@ public void Translate<T>(ref List<T> list, NodePacketValueFactory<T> factory) wh
                 for (int i = 0; i < count; i++)
                 {
                     T value = list[i];
-                    Translate<T>(ref value, factory);
+                    objectTranslator(this, ref value);
                 }
             }
 
@@ -888,7 +864,7 @@ public void Translate<T>(ref List<T> list, NodePacketValueFactory<T> factory) wh
             /// <param name="collectionFactory">factory to create the IList</param>
             /// <typeparam name="T">A TaskItemType</typeparam>
             /// <typeparam name="L">IList subtype</typeparam>
-            public void Translate<T, L>(ref IList<T> list, NodePacketValueFactory<T> factory, NodePacketCollectionCreator<L> collectionFactory) where T : ITranslatable where L : IList<T>
+            public void Translate<T, L>(ref IList<T> list, ObjectTranslator<T> objectTranslator, NodePacketCollectionCreator<L> collectionFactory) where L : IList<T>
             {
                 if (!TranslateNullable(list))
                 {
@@ -901,7 +877,7 @@ public void Translate<T, L>(ref IList<T> list, NodePacketValueFactory<T> factory
                 for (int i = 0; i < count; i++)
                 {
                     T value = list[i];
-                    Translate<T>(ref value, factory);
+                    objectTranslator(this, ref value);
                 }
             }
 
@@ -1016,24 +992,6 @@ public void Translate<T>(ref T value)
                 value.Translate(this);
             }
 
-            /// <summary>
-            /// Translates an object implementing INodePacketTranslatable which does not expose a
-            /// public parameterless constructor.
-            /// </summary>
-            /// <typeparam name="T">The reference type.</typeparam>
-            /// <param name="value">The value to be translated.</param>
-            /// <param name="factory">The factory method used to instantiate values of type T.</param>
-            public void Translate<T>(ref T value, NodePacketValueFactory<T> factory)
-                where T : ITranslatable
-            {
-                if (!TranslateNullable(value))
-                {
-                    return;
-                }
-
-                value.Translate(this);
-            }
-
             /// <summary>
             /// Translates a byte array
             /// </summary>
@@ -1081,8 +1039,7 @@ public void TranslateArray<T>(ref T[] array)
             /// <typeparam name="T">The reference type.</typeparam>
             /// <param name="array">The array to be translated.</param>
             /// <param name="factory">The factory method used to instantiate values of type T.</param>
-            public void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
-                where T : ITranslatable
+            public void TranslateArray<T>(ref T[] array, ObjectTranslator<T> objectTranslator)
             {
                 if (!TranslateNullable(array))
                 {
@@ -1094,7 +1051,7 @@ public void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
 
                 for (int i = 0; i < count; i++)
                 {
-                    array[i].Translate(this);
+                    objectTranslator(this, ref array[i]);
                 }
             }
 
@@ -1130,8 +1087,8 @@ public void TranslateDictionary(ref IDictionary<string, string> dictionary, Node
 
             public void TranslateDictionary<K, V>(
                 ref IDictionary<K, V> dictionary,
-                Translator<K> keyTranslator,
-                Translator<V> valueTranslator,
+                ObjectTranslator<K> keyTranslator,
+                ObjectTranslator<V> valueTranslator,
                 NodePacketCollectionCreator<IDictionary<K, V>> collectionCreator)
             {
                 if (!TranslateNullable(dictionary))
@@ -1145,9 +1102,9 @@ public void TranslateDictionary<K, V>(
                 foreach (KeyValuePair<K, V> pair in dictionary)
                 {
                     K key = pair.Key;
-                    keyTranslator.Invoke(ref key, this);
+                    keyTranslator(this, ref key);
                     V value = pair.Value;
-                    valueTranslator.Invoke(ref value, this);
+                    valueTranslator(this, ref value);
                 }
             }
 
@@ -1158,8 +1115,8 @@ public void TranslateDictionary<K, V>(
             /// <param name="dictionary">The dictionary to be translated.</param>
             /// <param name="comparer">The comparer used to instantiate the dictionary.</param>
             /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
-            public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityComparer<string> comparer, NodePacketValueFactory<T> valueFactory)
-                where T : class, ITranslatable
+            public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityComparer<string> comparer, ObjectTranslator<T> objectTranslator)
+                where T : class
             {
                 if (!TranslateNullable(dictionary))
                 {
@@ -1174,7 +1131,7 @@ public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEquali
                     string key = pair.Key;
                     Translate(ref key);
                     T value = pair.Value;
-                    Translate(ref value, valueFactory);
+                    objectTranslator(this, ref value);
                 }
             }
 
@@ -1185,9 +1142,9 @@ public void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEquali
             /// <typeparam name="T">The reference type for values in the dictionary.</typeparam>
             /// <param name="dictionary">The dictionary to be translated.</param>
             /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
-            public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> valueFactory)
+            public void TranslateDictionary<D, T>(ref D dictionary, ObjectTranslator<T> objectTranslator)
                 where D : IDictionary<string, T>, new()
-                where T : class, ITranslatable
+                where T : class
             {
                 if (!TranslateNullable(dictionary))
                 {
@@ -1202,7 +1159,7 @@ public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T
                     string key = pair.Key;
                     Translate(ref key);
                     T value = pair.Value;
-                    Translate(ref value, valueFactory);
+                    objectTranslator(this, ref value);
                 }
             }
 
@@ -1214,9 +1171,9 @@ public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T
             /// <param name="dictionary">The dictionary to be translated.</param>
             /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
             /// <param name="dictionaryCreator">The delegate used to instantiate the dictionary.</param>
-            public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> valueFactory, NodePacketCollectionCreator<D> dictionaryCreator)
+            public void TranslateDictionary<D, T>(ref D dictionary, ObjectTranslator<T> objectTranslator, NodePacketCollectionCreator<D> dictionaryCreator)
                 where D : IDictionary<string, T>
-                where T : class, ITranslatable
+                where T : class
             {
                 if (!TranslateNullable(dictionary))
                 {
@@ -1231,7 +1188,7 @@ public void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T
                     string key = pair.Key;
                     Translate(ref key);
                     T value = pair.Value;
-                    Translate(ref value, valueFactory);
+                    objectTranslator(this, ref value);
                 }
             }
 
diff --git a/src/Shared/ITranslatable.cs b/src/Shared/ITranslatable.cs
index 1ddeb30a6f6..a235e30aa2e 100644
--- a/src/Shared/ITranslatable.cs
+++ b/src/Shared/ITranslatable.cs
@@ -3,13 +3,6 @@
 
 namespace Microsoft.Build.BackEnd
 {
-    /// <summary>
-    /// Delegate for users that want to translate an arbitrary structure that cannot implement <see cref="ITranslatable"/> (e.g. translating a complex collection)
-    /// </summary>
-    /// <param name="translator">the translator</param>
-    /// <param name="obj">the object to translate</param>
-    internal delegate void Translator<T>(ref T obj, ITranslator translator);
-
     /// <summary>
     /// An interface representing an object which may be serialized by the node packet serializer.
     /// </summary>
diff --git a/src/Shared/ITranslator.cs b/src/Shared/ITranslator.cs
index 088ffef172d..7bd5655fee4 100644
--- a/src/Shared/ITranslator.cs
+++ b/src/Shared/ITranslator.cs
@@ -16,6 +16,13 @@ namespace Microsoft.Build.BackEnd
     /// <typeparam name="T">The type to be translated.</typeparam>
     internal delegate T NodePacketValueFactory<T>(ITranslator translator);
 
+    /// <summary>
+    /// Delegate for users that want to translate an arbitrary structure that doesn't implement <see cref="ITranslatable"/> (e.g. translating a complex collection)
+    /// </summary>
+    /// <param name="translator">the translator</param>
+    /// <param name="objectToTranslate">the object to translate</param>
+    internal delegate void ObjectTranslator<T>(ITranslator translator, ref T objectToTranslate);
+
     /// <summary>
     /// This delegate is used to create arbitrary collection types for serialization.
     /// </summary>
@@ -161,7 +168,7 @@ BinaryWriter Writer
         /// <param name="list">The list to be translated.</param>
         /// <param name="factory">factory to create type T</param>
         /// <typeparam name="T">A TaskItemType</typeparam>
-        void Translate<T>(ref List<T> list, NodePacketValueFactory<T> factory) where T : ITranslatable;
+        void Translate<T>(ref List<T> list, ObjectTranslator<T> objectTranslator);
 
         /// <summary>
         /// Translates a list of T where T implements INodePacketTranslateable using a collection factory
@@ -171,7 +178,7 @@ BinaryWriter Writer
         /// <typeparam name="T">An ITranslatable subtype</typeparam>
         /// <typeparam name="L">An IList subtype</typeparam>
         /// <param name="collectionFactory">factory to create a collection</param>
-        void Translate<T, L>(ref IList<T> list, NodePacketValueFactory<T> factory, NodePacketCollectionCreator<L> collectionFactory) where T : ITranslatable where L : IList<T>;
+        void Translate<T, L>(ref IList<T> list, ObjectTranslator<T> objectTranslator, NodePacketCollectionCreator<L> collectionFactory) where L : IList<T>;
 
         /// <summary>
         /// Translates a DateTime.
@@ -240,16 +247,6 @@ BinaryWriter Writer
         void Translate<T>(ref T value)
             where T : ITranslatable, new();
 
-        /// <summary>
-        /// Translates an object implementing INodePacketTranslatable which does not expose a
-        /// public parameterless constructor.
-        /// </summary>
-        /// <typeparam name="T">The reference type.</typeparam>
-        /// <param name="value">The value to be translated.</param>
-        /// <param name="factory">The factory method used to instantiate values of type T.</param>
-        void Translate<T>(ref T value, NodePacketValueFactory<T> factory)
-            where T : ITranslatable;
-
         /// <summary>
         /// Translates a culture
         /// </summary>
@@ -271,13 +268,12 @@ void TranslateArray<T>(ref T[] array)
             where T : ITranslatable, new();
 
         /// <summary>
-        /// Translates an array of objects implementing INodePacketTranslatable requiring a factory to create.
+        /// Translates an array of objects.
         /// </summary>
         /// <typeparam name="T">The reference type.</typeparam>
         /// <param name="array">The array to be translated.</param>
-        /// <param name="factory">The factory method used to instantiate values of type T.</param>
-        void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
-            where T : ITranslatable;
+        /// <param name="objectTranslator">The delegate method used to translate values of type T.</param>
+        void TranslateArray<T>(ref T[] array, ObjectTranslator<T> objectTranslator);
 
         /// <summary>
         /// Translates a dictionary of { string, string }.
@@ -288,7 +284,7 @@ void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
 
         void TranslateDictionary(ref IDictionary<string, string> dictionary, NodePacketCollectionCreator<IDictionary<string, string>> collectionCreator);
 
-        void TranslateDictionary<K, V>(ref IDictionary<K, V> dictionary, Translator<K> keyTranslator, Translator<V> valueTranslator, NodePacketCollectionCreator<IDictionary<K, V>> dictionaryCreator);
+        void TranslateDictionary<K, V>(ref IDictionary<K, V> dictionary, ObjectTranslator<K> keyTranslator, ObjectTranslator<V> valueTranslator, NodePacketCollectionCreator<IDictionary<K, V>> dictionaryCreator);
 
         /// <summary>
         /// Translates a dictionary of { string, T }.  
@@ -297,8 +293,8 @@ void TranslateArray<T>(ref T[] array, NodePacketValueFactory<T> factory)
         /// <param name="dictionary">The dictionary to be translated.</param>
         /// <param name="comparer">The comparer used to instantiate the dictionary.</param>
         /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
-        void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityComparer<string> comparer, NodePacketValueFactory<T> valueFactory)
-            where T : class, ITranslatable;
+        void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityComparer<string> comparer, ObjectTranslator<T> objectTranslator)
+            where T : class;
 
         /// <summary>
         /// Translates a dictionary of { string, T } for dictionaries with public parameterless constructors.
@@ -307,9 +303,9 @@ void TranslateDictionary<T>(ref Dictionary<string, T> dictionary, IEqualityCompa
         /// <typeparam name="T">The reference type for values in the dictionary.</typeparam>
         /// <param name="dictionary">The dictionary to be translated.</param>
         /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
-        void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> valueFactory)
+        void TranslateDictionary<D, T>(ref D dictionary, ObjectTranslator<T> objectTranslator)
             where D : IDictionary<string, T>, new()
-            where T : class, ITranslatable;
+            where T : class;
 
         /// <summary>
         /// Translates a dictionary of { string, T } for dictionaries with public parameterless constructors.
@@ -319,9 +315,9 @@ void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> value
         /// <param name="dictionary">The dictionary to be translated.</param>
         /// <param name="valueFactory">The factory used to instantiate values in the dictionary.</param>
         /// <param name="collectionCreator">A factory used to create the dictionary.</param>
-        void TranslateDictionary<D, T>(ref D dictionary, NodePacketValueFactory<T> valueFactory, NodePacketCollectionCreator<D> collectionCreator)
+        void TranslateDictionary<D, T>(ref D dictionary, ObjectTranslator<T> objectTranslator, NodePacketCollectionCreator<D> collectionCreator)
             where D : IDictionary<string, T>
-            where T : class, ITranslatable;
+            where T : class;
 
         /// <summary>
         /// Translates the boolean that says whether this value is null or not
diff --git a/src/Shared/TranslatorHelpers.cs b/src/Shared/TranslatorHelpers.cs
new file mode 100644
index 00000000000..d58e5b42c18
--- /dev/null
+++ b/src/Shared/TranslatorHelpers.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.Build.BackEnd
+{
+    internal static class TranslatorHelpers
+    {
+        /// <summary>
+        /// Translates an object implementing <see cref="ITranslatable"/> which does not expose a
+        /// public parameterless constructor.
+        /// </summary>
+        /// <typeparam name="T">The reference type.</typeparam>
+        /// <param name="translator">The translator</param>
+        /// <param name="instance">The value to be translated.</param>
+        /// <param name="factory">The factory method used to instantiate values of type T.</param>
+        public static void Translate<T>(
+            this ITranslator translator,
+            ref T instance,
+            NodePacketValueFactory<T> valueFactory) where T : ITranslatable
+        {
+            if (!translator.TranslateNullable(instance))
+            {
+                return;
+            }
+            if (translator.Mode == TranslationDirection.ReadFromStream)
+            {
+                instance = valueFactory(translator);
+            }
+            else
+            {
+                instance.Translate(translator);
+            }
+        }
+
+        static ObjectTranslator<T> AdaptFactory<T>(NodePacketValueFactory<T> valueFactory) where T : ITranslatable
+        {
+            void Translate(ITranslator translator, ref T objectToTranslate)
+            {
+                TranslatorHelpers.Translate<T>(translator, ref objectToTranslate, valueFactory);
+            }
+
+            return Translate;
+        }
+
+        public static void Translate<T>(
+            this ITranslator translator,
+            ref List<T> list,
+            NodePacketValueFactory<T> valueFactory) where T : class, ITranslatable
+        {
+            translator.Translate(ref list, AdaptFactory(valueFactory));
+        }
+
+        public static void Translate<T, L>(
+            this ITranslator translator,
+            ref IList<T> list,
+            NodePacketValueFactory<T> valueFactory,
+            NodePacketCollectionCreator<L> collectionFactory) where L : IList<T> where T : ITranslatable
+        {
+            translator.Translate(ref list, AdaptFactory(valueFactory), collectionFactory);
+        }
+
+        public static void TranslateArray<T>(
+            this ITranslator translator,
+            ref T[] array,
+            NodePacketValueFactory<T> valueFactory) where T : class, ITranslatable
+        {
+            translator.TranslateArray(ref array, AdaptFactory(valueFactory));
+        }
+
+        public static void TranslateDictionary<T>(
+            this ITranslator translator,
+            ref Dictionary<string, T> dictionary,
+            IEqualityComparer<string> comparer,
+            NodePacketValueFactory<T> valueFactory) where T : class, ITranslatable
+        {
+            translator.TranslateDictionary(ref dictionary, comparer, AdaptFactory(valueFactory));
+        }
+
+        public static void TranslateDictionary<D, T>(
+            this ITranslator translator,
+            ref D dictionary,
+            NodePacketValueFactory<T> valueFactory)
+            where D : IDictionary<string, T>, new()
+            where T : class, ITranslatable
+        {
+            translator.TranslateDictionary(ref dictionary, AdaptFactory(valueFactory));
+        }
+
+        public static void TranslateDictionary<D, T>(
+            this ITranslator translator,
+            ref D dictionary,
+            NodePacketValueFactory<T> valueFactory,
+            NodePacketCollectionCreator<D> collectionCreator)
+            where D : IDictionary<string, T>
+            where T : class, ITranslatable
+        {
+            translator.TranslateDictionary(ref dictionary, AdaptFactory(valueFactory), collectionCreator);
+        }
+    }
+}