diff --git a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Cascading.cs b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Cascading.cs
index 9d1e924c8d76f21066b04a7f30e9ff7a82e9249e..99e74647496c43e8d8a62fff8adb67fbc60f65ef 100644
--- a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Cascading.cs
+++ b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Cascading.cs
@@ -28,7 +28,7 @@ class C : I
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -62,7 +62,7 @@ class C : I
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -96,7 +96,7 @@ public void M(int x, string y)
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -131,7 +131,7 @@ class D : B
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -167,7 +167,7 @@ public override void M(int x, string y)
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -209,7 +209,7 @@ class D2 : D
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -257,7 +257,7 @@ public override void M(int x, string y)
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -303,7 +303,7 @@ class C : I3 { public void M(int x, string y) { } }";
 
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
@@ -362,7 +362,7 @@ public class D2 : D
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(0)
             };
             var updatedCode = @"
diff --git a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Delegates.cs b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Delegates.cs
index 9c97cb90af3f2b6499a5af7a488f60fc6b1d8b7b..4e4bb5688759fdeadaa99c616cf228f9ad5f09e0 100644
--- a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Delegates.cs
+++ b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Delegates.cs
@@ -28,7 +28,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -62,7 +62,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -96,7 +96,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -131,7 +131,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -165,7 +165,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -199,7 +199,7 @@ void M()
     }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
             };
             var expectedUpdatedCode = @"
 delegate void MyDelegate(int newIntegerParameter);
@@ -238,7 +238,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -280,7 +280,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -323,7 +323,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -370,7 +370,7 @@ private MyDelegate Result()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -420,7 +420,7 @@ private IEnumerable<MyDelegate> Result()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -463,7 +463,7 @@ void M6()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -497,7 +497,7 @@ private IEnumerable<MyDelegate> Result3()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -530,7 +530,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -578,7 +578,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -628,7 +628,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
@@ -669,7 +669,7 @@ void B()
     }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
             };
             var expectedUpdatedCode = @"
 public class DP16a
@@ -706,7 +706,7 @@ public class D17Test
     internal void M17(string s) { }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
             };
             var expectedUpdatedCode = @"
 public class D17<T>
@@ -747,7 +747,7 @@ void B()
     }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
             };
             var expectedUpdatedCode = @"
 class DA
@@ -789,7 +789,7 @@ public void M()
     }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345"))
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int")
             };
             var expectedUpdatedCode = @"public class CD<T>
 {
@@ -827,7 +827,7 @@ void B()
     }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345"))
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int")
             };
             var expectedUpdatedCode = @"
 public class C2<T>
@@ -872,7 +872,7 @@ private MyFunc Test()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "int"),
                 new AddedParameterOrExistingIndex(1)
             };
             var expectedUpdatedCode = @"
diff --git a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Formatting.cs b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Formatting.cs
index 9baece1b274661aa7dfe94e5911f9f62c33d7c13..c4483939cc042382c536b44b2c389bbf03e90cc0 100644
--- a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Formatting.cs
+++ b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Formatting.cs
@@ -31,7 +31,7 @@ class C
                 new AddedParameterOrExistingIndex(5),
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(3),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
@@ -71,7 +71,7 @@ class C
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(3),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(5)};
             var expectedUpdatedCode = @"
@@ -111,7 +111,7 @@ class C
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(3),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(5)};
             var expectedUpdatedCode = @"
@@ -145,7 +145,7 @@ class C
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 class C
@@ -175,7 +175,7 @@ class SomeClass
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 class SomeClass
@@ -208,7 +208,7 @@ class SomeClass
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 class SomeClass
@@ -245,7 +245,7 @@ class SomeClass
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 class SomeClass
@@ -284,7 +284,7 @@ void M()
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 class SomeClass
@@ -324,7 +324,7 @@ class D : B
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 class B
@@ -356,7 +356,7 @@ class CustomAttribute : System.Attribute
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var expectedUpdatedCode = @"
 [Custom(2,
@@ -381,7 +381,7 @@ class CustomAttribute : System.Attribute
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")) };
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte") };
             var expectedUpdatedCode = @"
 [Custom(
     2, bb: 34)]
@@ -405,7 +405,7 @@ class CustomAttribute : System.Attribute
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(0),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34"))};
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte")};
             var expectedUpdatedCode = @"
 [Custom(
     1, bb: 34)]
@@ -428,7 +428,7 @@ class CustomAttribute : System.Attribute
     public $$CustomAttribute(int x, int y) { }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34"))};
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte")};
             var expectedUpdatedCode = @"
 [Custom(
     bb: 34)]
@@ -452,7 +452,7 @@ class CustomAttribute : System.Attribute
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(2)};
             var expectedUpdatedCode = @"
 [Custom(2, z: 3, bb: 34)]
@@ -476,7 +476,7 @@ void M(System.Action<int, int> f, int z$$)
 }";
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(0),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34"))};
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte")};
             var expectedUpdatedCode = @"class C
 {
     void M(System.Action<int, int> f, byte bb)
diff --git a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.cs b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.cs
index bfe8253626d5f5598f0861128e5b9ee3b8ec52d8..9228189e71105ae786d9141160dfde8955267eff 100644
--- a/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.cs
+++ b/src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.cs
@@ -59,8 +59,8 @@ static class Ext
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(0),
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345")),
-                new AddedParameterOrExistingIndex(new AddedParameter("string", "newString", "")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "System.Int32"),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "string", "newString", ""), "System.String"),
                 new AddedParameterOrExistingIndex(5)};
             var updatedCode = @"
 static class Ext
@@ -119,7 +119,7 @@ static class Ext
     }
 }";
             var updatedSignature = new[] {
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "12345"))};
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "12345"), "System.Int32")};
             var updatedCode = @"
 static class Ext
 {
@@ -149,7 +149,7 @@ public void M()
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 using System;
@@ -184,7 +184,7 @@ void Goo(int x, string y)
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 using System;
@@ -215,7 +215,7 @@ class MyClass
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 using System;
@@ -243,7 +243,7 @@ class MyClass
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 using System;
@@ -272,7 +272,7 @@ class MyClass
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 using System;
@@ -313,7 +313,7 @@ public MyClass() : this(2, ""test"")
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 using System;
@@ -357,7 +357,7 @@ class MyAttribute : System.Attribute
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 [My(8, x: ""test"", b: 34)]
@@ -396,7 +396,7 @@ public static void M(this $$C goo, int x, int y, string a = ""test_a"", string b
                 new AddedParameterOrExistingIndex(0),
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(5),
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(3)};
@@ -443,7 +443,7 @@ public static void M(this C goo, int x$$, int y, string a = ""test_a"", string b
                 new AddedParameterOrExistingIndex(0),
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(5),
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(3)};
@@ -480,7 +480,7 @@ public class C
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(2)};
             var updatedCode = @"
 public class C
@@ -508,7 +508,7 @@ public class C
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(2)};
 
             var updatedCode = @"
@@ -547,7 +547,7 @@ public static class CExt
                 new AddedParameterOrExistingIndex(0),
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(5),
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(3),
@@ -594,7 +594,7 @@ void M()
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 class Program
@@ -632,7 +632,7 @@ public class C
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 public class C
@@ -665,7 +665,7 @@ public class C
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 public class C
@@ -703,7 +703,7 @@ public class C
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(3),
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -743,7 +743,7 @@ public class C
                 new AddedParameterOrExistingIndex(4),
                 new AddedParameterOrExistingIndex(3),
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -779,7 +779,7 @@ class Program
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -812,7 +812,7 @@ class Program
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -844,7 +844,7 @@ public class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -877,7 +877,7 @@ public class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -909,7 +909,7 @@ public class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -942,7 +942,7 @@ public class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -976,7 +976,7 @@ public class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -1011,7 +1011,7 @@ public class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "bb", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "bb", "34"), "byte"),
                 new AddedParameterOrExistingIndex(1),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
@@ -1044,7 +1044,7 @@ class C
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 class C
@@ -1080,7 +1080,7 @@ class D : C, I
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 interface I
@@ -1123,7 +1123,7 @@ class D : C, I
 }";
             var permutation = new[] {
                 new AddedParameterOrExistingIndex(1),
-                new AddedParameterOrExistingIndex(new AddedParameter("byte", "b", "34")),
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "byte", "b", "34"), "byte"),
                 new AddedParameterOrExistingIndex(0)};
             var updatedCode = @"
 interface I
diff --git a/src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs b/src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
index 6395fef48d0c5e9d77f9d122b3641fae433130e7..344baebaa345ebe281288d61fb4249f6eef034ed 100644
--- a/src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
+++ b/src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
@@ -246,7 +246,7 @@ void M()
             var updatedSignature = new[] {
                 new AddedParameterOrExistingIndex(0),
                 new AddedParameterOrExistingIndex(2),
-                new AddedParameterOrExistingIndex(new AddedParameter("int", "newIntegerParameter", "123")) };
+                new AddedParameterOrExistingIndex(new AddedParameter(null, "int", "newIntegerParameter", "123"), "int") };
 
             using var testState = ChangeSignatureTestState.Create(XElement.Parse(workspaceXml));
             testState.TestChangeSignatureOptionsService.UpdatedSignature = updatedSignature;
diff --git a/src/EditorFeatures/TestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs b/src/EditorFeatures/TestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs
index d7a6b5bf1449376877b43a408acae428ea78216f..130a7e200afccdc5b5075661ff54a1c98dae904a 100644
--- a/src/EditorFeatures/TestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs
+++ b/src/EditorFeatures/TestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs
@@ -173,10 +173,13 @@ private string GetSignatureDescriptionString(AddedParameterOrExistingIndex[] sig
                 removeDescription = removed.Any() ? string.Format(", Removed: {{{0}}}", string.Join(", ", removed)) : string.Empty;
             }
 
-            var newParametersString = string.Join(",", signature.Where(p => !p.IsExisting).Select(p => p.AddedParameter));
-            var addDescription = !newParametersString.IsEmpty() ? string.Format(", Added {{{0}}}", newParametersString) : string.Empty;
+            // TODO!
+            // var newParametersString = string.Join(",", signature.Where(p => !p.IsExisting).Select(p => p._addedParameterWithoutTypeSymbol));
+            // var addDescription = !newParametersString.IsEmpty() ? string.Format(", Added {{{0}}}", newParametersString) : string.Empty;
 
-            return string.Format("Parameters: <{0}>{1}{2}", string.Join(", ", signature.Select(item => item.ToString())), removeDescription, addDescription);
+            // return string.Format("Parameters: <{0}>{1}{2}", string.Join(", ", signature.Select(item => item.ToString())), removeDescription, addDescription);
+
+            return "FAIL";
         }
 
         /// <summary>
diff --git a/src/EditorFeatures/TestUtilities/ChangeSignature/AddedParameterOrExistingIndex.cs b/src/EditorFeatures/TestUtilities/ChangeSignature/AddedParameterOrExistingIndex.cs
index 8e196f4492d9ed864adb3f663e972c872012d1c5..6531c4a6f167f2a4720f0dce7ac10006fede7b31 100644
--- a/src/EditorFeatures/TestUtilities/ChangeSignature/AddedParameterOrExistingIndex.cs
+++ b/src/EditorFeatures/TestUtilities/ChangeSignature/AddedParameterOrExistingIndex.cs
@@ -2,7 +2,12 @@
 
 #nullable enable
 
+using System;
+using System.Threading;
 using Microsoft.CodeAnalysis.ChangeSignature;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.Test.Utilities.ChangeSignature
 {
@@ -12,23 +17,34 @@ internal sealed class AddedParameterOrExistingIndex
 
         public int? OldIndex { get; }
 
-        public AddedParameter? AddedParameter { get; }
+        private readonly AddedParameter? _addedParameterWithoutTypeSymbol;
+        private readonly string? _addedParameterFullyQualifiedTypeName;
 
         public AddedParameterOrExistingIndex(int index)
         {
             OldIndex = index;
             IsExisting = true;
-            AddedParameter = null;
+            _addedParameterWithoutTypeSymbol = null;
+            _addedParameterFullyQualifiedTypeName = null;
         }
 
-        public AddedParameterOrExistingIndex(AddedParameter addedParameter)
+        public AddedParameterOrExistingIndex(AddedParameter addedParameterWithoutTypeSymbol, string addedParameterFullyQualifiedTypeName)
         {
             OldIndex = null;
             IsExisting = false;
-            AddedParameter = addedParameter;
+            _addedParameterWithoutTypeSymbol = addedParameterWithoutTypeSymbol;
+            _addedParameterFullyQualifiedTypeName = addedParameterFullyQualifiedTypeName;
         }
 
         public override string ToString()
-            => IsExisting ? OldIndex.ToString() : (AddedParameter?.ToString() ?? string.Empty);
+            => IsExisting ? OldIndex.ToString() : (_addedParameterWithoutTypeSymbol?.ToString() ?? string.Empty);
+
+        internal AddedParameter GetAddedParameter(Document document)
+        {
+            var semanticModel = document.GetRequiredSemanticModelAsync(CancellationToken.None).Result;
+            var type = semanticModel.GetSpeculativeTypeInfo(0, SyntaxFactory.ParseTypeName(_addedParameterFullyQualifiedTypeName), SpeculativeBindingOption.BindAsTypeOrNamespace).Type;
+
+            return new AddedParameter(type!, _addedParameterWithoutTypeSymbol!.TypeNameDisplayWithErrorIndicator, _addedParameterWithoutTypeSymbol.ParameterName, _addedParameterWithoutTypeSymbol.CallSiteValue);
+        }
     }
 }
diff --git a/src/EditorFeatures/TestUtilities/ChangeSignature/TestChangeSignatureOptionsService.cs b/src/EditorFeatures/TestUtilities/ChangeSignature/TestChangeSignatureOptionsService.cs
index b6bbcfb33f998b72dc3bdb9e876d5b94b305c903..484423bc5f3fe3d2defc1f7e7620bce1a851ab59 100644
--- a/src/EditorFeatures/TestUtilities/ChangeSignature/TestChangeSignatureOptionsService.cs
+++ b/src/EditorFeatures/TestUtilities/ChangeSignature/TestChangeSignatureOptionsService.cs
@@ -30,8 +30,8 @@ public TestChangeSignatureOptionsService()
         {
             var list = parameters.ToListOfParameters();
             IEnumerable<Parameter?> updateParameters = UpdatedSignature != null
-                ? UpdatedSignature.Select(item => item.IsExisting ? list[item.OldIndex ?? -1] : item.AddedParameter)
-                : new Parameter?[0];
+                ? UpdatedSignature.Select(item => item.IsExisting ? list[item.OldIndex ?? -1] : item.GetAddedParameter(document))
+                : new Parameter?[0]!;
             return new ChangeSignatureOptionsResult(new SignatureChange(
                     parameters,
                     UpdatedSignature == null
diff --git a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb
index 3eb31f4d65e021661befe258f722418cff3a1830..effb4f5abc1884eba87f4d4dc86fb6fbcbcad5ff 100644
--- a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb
+++ b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb
@@ -21,7 +21,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Interface I
@@ -53,7 +53,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Interface I
@@ -85,7 +85,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Interface I
@@ -119,7 +119,7 @@ Class D
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class B
@@ -155,7 +155,7 @@ Class D
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class B
@@ -198,7 +198,7 @@ Class D
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class B
@@ -247,7 +247,7 @@ Class D
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class B
@@ -326,7 +326,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class B
@@ -395,7 +395,7 @@ Class D
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class B
diff --git a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Delegates.vb b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Delegates.vb
index 30db0cdd38aa6f87cc7444f96c2d6be32b84e221..098a301add6b5a90a1d09201b7708ec73db2cbee 100644
--- a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Delegates.vb
+++ b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Delegates.vb
@@ -23,7 +23,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MySub(z As Boolean, newIntegerParameter As Integer, y As String)
@@ -53,7 +53,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MySub(z As Boolean, newIntegerParameter As Integer, y As String)
@@ -83,7 +83,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MySub(z As Boolean, newIntegerParameter As Integer, y As String)
@@ -120,7 +120,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MySub(z As Boolean, newIntegerParameter As Integer, y As String)
@@ -166,7 +166,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Function MyFunc(z As Boolean, newIntegerParameter As Integer, y As String) As Integer
@@ -208,7 +208,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Function MyFunc(z As Boolean, newIntegerParameter As Integer, y As String) As Integer
@@ -244,7 +244,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MySub(z As Boolean, newIntegerParameter As Integer, y As String)
@@ -277,7 +277,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Function MyFunc(z As Boolean, newIntegerParameter As Integer, y As String) As MyFunc
@@ -321,7 +321,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 ''' <summary>
@@ -368,7 +368,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MySub(z As Boolean, newIntegerParameter As Integer, y As String)
@@ -403,7 +403,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Function MyFunc(z As Boolean, newIntegerParameter As Integer, y As String) As Integer
@@ -445,7 +445,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -483,7 +483,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -513,7 +513,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -546,7 +546,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -575,7 +575,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -609,7 +609,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -655,7 +655,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -704,7 +704,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -749,7 +749,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -785,7 +785,7 @@ Class C
 End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345"))}
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer")}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Delegate Sub MyDelegate(Of T)(newIntegerParameter As Integer)
 
diff --git a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Formatting.vb b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Formatting.vb
index 9f02ace14bc0d8a4f367b5d8fe9875758406f07d..9ab649867d8f4ecdfc5f936d04d35642666a6b98 100644
--- a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Formatting.vb
+++ b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Formatting.vb
@@ -26,7 +26,7 @@ End Class
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(5),
                 New AddedParameterOrExistingIndex(4),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(3),
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
@@ -59,7 +59,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -86,7 +86,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -110,7 +110,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -141,7 +141,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -178,7 +178,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -218,7 +218,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -255,7 +255,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 <Custom(2,
@@ -279,7 +279,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -304,7 +304,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -334,7 +334,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -363,7 +363,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
@@ -390,7 +390,7 @@ End Class
 ]]></Text>.NormalizedValue()
             Dim updatedSignature = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim expectedUpdatedCode = <Text><![CDATA[
 Class C
diff --git a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.vb b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.vb
index b5deb25d562f2ec4186f473361066cc913acc007..fc73f450549ccf4a539d0d8c79a2cad72d91346b 100644
--- a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.vb
@@ -50,7 +50,7 @@ End Module
             Dim permutation = {
                 New AddedParameterOrExistingIndex(0),
                 New AddedParameterOrExistingIndex(3),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1),
                 New AddedParameterOrExistingIndex(5)}
             Dim updatedCode = <Text><![CDATA[
@@ -104,7 +104,7 @@ End Module
 
 ]]></Text>.NormalizedValue()
             Dim permutation = {
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345"))}
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer")}
             Dim updatedCode = <Text><![CDATA[
 Module Program
     Sub M(newIntegerParameter As Integer)
@@ -127,7 +127,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -150,7 +150,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -173,7 +173,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -208,7 +208,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class D
@@ -245,7 +245,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 <C("two", x:=1, newIntegerParameter:=12345)>
@@ -277,7 +277,7 @@ End Module]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(0),
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1),
                 New AddedParameterOrExistingIndex(5),
                 New AddedParameterOrExistingIndex(4),
@@ -320,7 +320,7 @@ End Module]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(0),
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1),
                 New AddedParameterOrExistingIndex(5),
                 New AddedParameterOrExistingIndex(4),
@@ -354,7 +354,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
                 New AddedParameterOrExistingIndex(0),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(2)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -378,7 +378,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
                 New AddedParameterOrExistingIndex(0),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(2)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -414,7 +414,7 @@ End Module]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(0),
                 New AddedParameterOrExistingIndex(2),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(1),
                 New AddedParameterOrExistingIndex(3)}
             Dim updatedCode = <Text><![CDATA[
@@ -460,7 +460,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -496,7 +496,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -523,7 +523,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -550,7 +550,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -577,7 +577,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -605,7 +605,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -634,7 +634,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -663,7 +663,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -693,7 +693,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -727,7 +727,7 @@ End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(2),
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C
@@ -760,7 +760,7 @@ Class C
 End Class]]></Text>.NormalizedValue()
             Dim permutation = {
                 New AddedParameterOrExistingIndex(1),
-                New AddedParameterOrExistingIndex(New AddedParameter("Integer", "newIntegerParameter", "12345")),
+                New AddedParameterOrExistingIndex(New AddedParameter(Nothing, "Integer", "newIntegerParameter", "12345"), "Integer"),
                 New AddedParameterOrExistingIndex(0)}
             Dim updatedCode = <Text><![CDATA[
 Class C