diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
index 7f2914542f6ec..52366c79d5517 100644
--- a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
+++ b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
@@ -8124,8 +8124,7 @@ static void F(object x)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "x is string s", CSharpFeaturesResources.is_pattern));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8154,8 +8153,7 @@ static void F(object x)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "var (x, y) = x", CSharpFeaturesResources.deconstruction));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8214,8 +8212,7 @@ static void F(object o1, object o2)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "var (x, y) = o2", CSharpFeaturesResources.deconstruction));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8244,8 +8241,7 @@ static void F(object o1, object o2)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "(int x, int y) = o2", CSharpFeaturesResources.deconstruction));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8274,8 +8270,7 @@ static void F(object o)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "(int, int)", CSharpFeaturesResources.tuple));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8334,8 +8329,7 @@ static void F()
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "var x", CSharpFeaturesResources.out_var));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8363,8 +8357,7 @@ static void F()
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-               Diagnostic(RudeEditKind.UpdateAroundActiveStatement, null, "out variable"));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8393,8 +8386,7 @@ static void F()
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "ref int", CSharpFeaturesResources.ref_local_or_expression));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8423,8 +8415,7 @@ static void F(object o1, object o2)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "var (x, y) = o2", CSharpFeaturesResources.deconstruction));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8455,8 +8446,7 @@ static void F(object o1, object o2)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "(x, y) = o2", CSharpFeaturesResources.deconstruction));
+            edits.VerifyRudeDiagnostics(active);
         }
 
         [Fact]
@@ -8467,7 +8457,7 @@ class C
 {
     static void F(object o1, object o2)
     {
-        <AS:0>Console.WriteLine(1);</AS:0>
+        <AS:0>System.Console.WriteLine(1);</AS:0>
         switch (o1)
         {
             case int i:
@@ -8481,7 +8471,7 @@ class C
 {
     static void F(object o1, object o2)
     {
-        <AS:0>Console.WriteLine(1);</AS:0>
+        <AS:0>System.Console.WriteLine(1);</AS:0>
         switch (o2)
         {
             case int i:
@@ -8493,8 +8483,8 @@ static void F(object o1, object o2)
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "int i", CSharpFeaturesResources.v7_switch));
+            edits.VerifyRudeDiagnostics(active);
+            edits.VerifySemanticDiagnostics(Diagnostic(RudeEditKind.UpdateAroundActiveStatement, null, "C# 7 enhanced switch statement"));
         }
 
         #endregion
diff --git a/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs b/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
index 6c88d12ed3371..a49f7d2650dd7 100644
--- a/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
+++ b/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
@@ -3108,18 +3108,9 @@ private static bool IsUnsupportedCSharp7EnCNode(SyntaxNode n)
         {
             switch (n.Kind())
             {
-                case SyntaxKind.IsPatternExpression:
                 case SyntaxKind.ForEachVariableStatement:
-                case SyntaxKind.TupleType:
-                case SyntaxKind.TupleExpression:
                 case SyntaxKind.LocalFunctionStatement:
-                case SyntaxKind.DeclarationExpression:
-                case SyntaxKind.RefType:
-                case SyntaxKind.RefExpression:
-                case SyntaxKind.DeclarationPattern:
                     return true;
-                case SyntaxKind.SimpleAssignmentExpression:
-                    return ((AssignmentExpressionSyntax)n).IsDeconstruction();
                 default:
                     return false;
             }