diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt
index ed1c8eaec85..d200258fdb1 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(5,12): error TS2300: Duplicate identifier 'fn'.
-tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(10,5): error TS2300: Duplicate identifier 'fn'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(10,21): error TS2300: Duplicate identifier 'fn'.
 
 
 ==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts (2 errors) ====
@@ -15,12 +15,10 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
     module clodule {
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): T {
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            return x;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+                        ~~
 !!! error TS2300: Duplicate identifier 'fn'.
+            return x;
+        }
     }
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt
index bf1c4f36d1b..474613e283f 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts(5,12): error TS2300: Duplicate identifier 'fn'.
-tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts(10,5): error TS2300: Duplicate identifier 'fn'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts(10,21): error TS2300: Duplicate identifier 'fn'.
 
 
 ==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts (2 errors) ====
@@ -15,12 +15,10 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
     module clodule {
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): T {
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            return x;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+                        ~~
 !!! error TS2300: Duplicate identifier 'fn'.
+            return x;
+        }
     }
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt
index b3c2a87e176..a59953e7fb2 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(4,12): error TS2300: Duplicate identifier 'Origin'.
-tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(8,5): error TS2300: Duplicate identifier 'Origin'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(8,21): error TS2300: Duplicate identifier 'Origin'.
 tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(16,16): error TS2300: Duplicate identifier 'Origin'.
-tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20,9): error TS2300: Duplicate identifier 'Origin'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20,25): error TS2300: Duplicate identifier 'Origin'.
 
 
 ==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts (4 errors) ====
@@ -15,7 +15,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
     
     module Point {
         export function Origin() { return null; } //expected duplicate identifier error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~~~~
 !!! error TS2300: Duplicate identifier 'Origin'.
     }
     
@@ -31,7 +31,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
     
         export module Point {
             export function Origin() { return ""; }//expected duplicate identifier error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                            ~~~~~~
 !!! error TS2300: Duplicate identifier 'Origin'.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt b/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt
index a63f795ec88..16df32bb2c5 100644
--- a/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt
+++ b/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/ambientClassOverloadForFunction.ts(1,15): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/ambientClassOverloadForFunction.ts(2,1): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/ambientClassOverloadForFunction.ts(2,10): error TS2300: Duplicate identifier 'foo'.
 
 
 ==== tests/cases/compiler/ambientClassOverloadForFunction.ts (2 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/ambientClassOverloadForFunction.ts(2,1): error TS2300: Dupl
                   ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     function foo() { return null; }
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/anyDeclare.errors.txt b/tests/baselines/reference/anyDeclare.errors.txt
index ec21bd1e859..8eda3672f24 100644
--- a/tests/baselines/reference/anyDeclare.errors.txt
+++ b/tests/baselines/reference/anyDeclare.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/anyDeclare.ts(3,9): error TS2300: Duplicate identifier 'myFn'.
-tests/cases/compiler/anyDeclare.ts(4,5): error TS2300: Duplicate identifier 'myFn'.
+tests/cases/compiler/anyDeclare.ts(4,14): error TS2300: Duplicate identifier 'myFn'.
 
 
 ==== tests/cases/compiler/anyDeclare.ts (2 errors) ====
@@ -9,7 +9,7 @@ tests/cases/compiler/anyDeclare.ts(4,5): error TS2300: Duplicate identifier 'myF
             ~~~~
 !!! error TS2300: Duplicate identifier 'myFn'.
         function myFn() {  }
-        ~~~~~~~~~~~~~~~~~~~~
+                 ~~~~
 !!! error TS2300: Duplicate identifier 'myFn'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/augmentedTypesClass2a.errors.txt b/tests/baselines/reference/augmentedTypesClass2a.errors.txt
index ed6c556a826..b17ab32d408 100644
--- a/tests/baselines/reference/augmentedTypesClass2a.errors.txt
+++ b/tests/baselines/reference/augmentedTypesClass2a.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/augmentedTypesClass2a.ts(2,7): error TS2300: Duplicate identifier 'c2'.
-tests/cases/compiler/augmentedTypesClass2a.ts(3,1): error TS2300: Duplicate identifier 'c2'.
+tests/cases/compiler/augmentedTypesClass2a.ts(3,10): error TS2300: Duplicate identifier 'c2'.
 tests/cases/compiler/augmentedTypesClass2a.ts(4,5): error TS2300: Duplicate identifier 'c2'.
 
 
@@ -9,7 +9,7 @@ tests/cases/compiler/augmentedTypesClass2a.ts(4,5): error TS2300: Duplicate iden
           ~~
 !!! error TS2300: Duplicate identifier 'c2'.
     function c2() { } // error
-    ~~~~~~~~~~~~~~~~~
+             ~~
 !!! error TS2300: Duplicate identifier 'c2'.
     var c2 = () => { }
         ~~
diff --git a/tests/baselines/reference/augmentedTypesEnum.errors.txt b/tests/baselines/reference/augmentedTypesEnum.errors.txt
index 6e04f9bfcf1..3102f9d4786 100644
--- a/tests/baselines/reference/augmentedTypesEnum.errors.txt
+++ b/tests/baselines/reference/augmentedTypesEnum.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/augmentedTypesEnum.ts(2,6): error TS2300: Duplicate identifier 'e1111'.
 tests/cases/compiler/augmentedTypesEnum.ts(3,5): error TS2300: Duplicate identifier 'e1111'.
 tests/cases/compiler/augmentedTypesEnum.ts(6,6): error TS2300: Duplicate identifier 'e2'.
-tests/cases/compiler/augmentedTypesEnum.ts(7,1): error TS2300: Duplicate identifier 'e2'.
+tests/cases/compiler/augmentedTypesEnum.ts(7,10): error TS2300: Duplicate identifier 'e2'.
 tests/cases/compiler/augmentedTypesEnum.ts(9,6): error TS2300: Duplicate identifier 'e3'.
 tests/cases/compiler/augmentedTypesEnum.ts(10,5): error TS2300: Duplicate identifier 'e3'.
 tests/cases/compiler/augmentedTypesEnum.ts(13,6): error TS2300: Duplicate identifier 'e4'.
@@ -26,7 +26,7 @@ tests/cases/compiler/augmentedTypesEnum.ts(21,12): error TS2432: In an enum with
          ~~
 !!! error TS2300: Duplicate identifier 'e2'.
     function e2() { } // error
-    ~~~~~~~~~~~~~~~~~
+             ~~
 !!! error TS2300: Duplicate identifier 'e2'.
     
     enum e3 { One } // error
diff --git a/tests/baselines/reference/augmentedTypesFunction.errors.txt b/tests/baselines/reference/augmentedTypesFunction.errors.txt
index 60d6dd3b30d..8d1ce671c9e 100644
--- a/tests/baselines/reference/augmentedTypesFunction.errors.txt
+++ b/tests/baselines/reference/augmentedTypesFunction.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/augmentedTypesFunction.ts(2,10): error TS2300: Duplicate identifier 'y1'.
 tests/cases/compiler/augmentedTypesFunction.ts(3,5): error TS2300: Duplicate identifier 'y1'.
-tests/cases/compiler/augmentedTypesFunction.ts(6,1): error TS2393: Duplicate function implementation.
-tests/cases/compiler/augmentedTypesFunction.ts(7,1): error TS2393: Duplicate function implementation.
+tests/cases/compiler/augmentedTypesFunction.ts(6,10): error TS2393: Duplicate function implementation.
+tests/cases/compiler/augmentedTypesFunction.ts(7,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/augmentedTypesFunction.ts(9,10): error TS2300: Duplicate identifier 'y2a'.
 tests/cases/compiler/augmentedTypesFunction.ts(10,5): error TS2300: Duplicate identifier 'y2a'.
 tests/cases/compiler/augmentedTypesFunction.ts(13,10): error TS2300: Duplicate identifier 'y3'.
@@ -23,10 +23,10 @@ tests/cases/compiler/augmentedTypesFunction.ts(21,6): error TS2300: Duplicate id
     
     // function then function
     function y2() { } // error
-    ~~~~~~~~~~~~~~~~~
+             ~~
 !!! error TS2393: Duplicate function implementation.
     function y2() { } // error
-    ~~~~~~~~~~~~~~~~~
+             ~~
 !!! error TS2393: Duplicate function implementation.
     
     function y2a() { }  // error
diff --git a/tests/baselines/reference/augmentedTypesVar.errors.txt b/tests/baselines/reference/augmentedTypesVar.errors.txt
index ee4319baffb..24c194d25c3 100644
--- a/tests/baselines/reference/augmentedTypesVar.errors.txt
+++ b/tests/baselines/reference/augmentedTypesVar.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/augmentedTypesVar.ts(6,5): error TS2300: Duplicate identifier 'x2'.
-tests/cases/compiler/augmentedTypesVar.ts(7,1): error TS2300: Duplicate identifier 'x2'.
+tests/cases/compiler/augmentedTypesVar.ts(7,10): error TS2300: Duplicate identifier 'x2'.
 tests/cases/compiler/augmentedTypesVar.ts(10,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x3' must be of type 'number', but here has type '() => void'.
 tests/cases/compiler/augmentedTypesVar.ts(13,5): error TS2300: Duplicate identifier 'x4'.
 tests/cases/compiler/augmentedTypesVar.ts(14,7): error TS2300: Duplicate identifier 'x4'.
@@ -23,7 +23,7 @@ tests/cases/compiler/augmentedTypesVar.ts(31,8): error TS2300: Duplicate identif
         ~~
 !!! error TS2300: Duplicate identifier 'x2'.
     function x2() { } // error
-    ~~~~~~~~~~~~~~~~~
+             ~~
 !!! error TS2300: Duplicate identifier 'x2'.
     
     var x3 = 1; 
diff --git a/tests/baselines/reference/callOverloads1.errors.txt b/tests/baselines/reference/callOverloads1.errors.txt
index 1f778a42cdf..64927462104 100644
--- a/tests/baselines/reference/callOverloads1.errors.txt
+++ b/tests/baselines/reference/callOverloads1.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/callOverloads1.ts(1,7): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads1.ts(9,1): error TS2300: Duplicate identifier 'Foo'.
+tests/cases/compiler/callOverloads1.ts(9,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads1.ts(9,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/callOverloads1.ts(17,1): error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
 
@@ -16,7 +16,7 @@ tests/cases/compiler/callOverloads1.ts(17,1): error TS2348: Value of type 'typeo
     }
     
     function Foo(); // error
-    ~~~~~~~~~~~~~~~
+             ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
diff --git a/tests/baselines/reference/callOverloads2.errors.txt b/tests/baselines/reference/callOverloads2.errors.txt
index 3759ae719c9..6291fa8f3de 100644
--- a/tests/baselines/reference/callOverloads2.errors.txt
+++ b/tests/baselines/reference/callOverloads2.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/callOverloads2.ts(3,7): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads2.ts(11,1): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads2.ts(13,1): error TS2393: Duplicate function implementation.
+tests/cases/compiler/callOverloads2.ts(11,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads2.ts(13,10): error TS2389: Function implementation name must be 'Foo'.
-tests/cases/compiler/callOverloads2.ts(14,1): error TS2393: Duplicate function implementation.
+tests/cases/compiler/callOverloads2.ts(13,10): error TS2393: Duplicate function implementation.
+tests/cases/compiler/callOverloads2.ts(14,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/callOverloads2.ts(16,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/callOverloads2.ts(24,1): error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
 
@@ -10,7 +10,7 @@ tests/cases/compiler/callOverloads2.ts(24,1): error TS2348: Value of type 'typeo
 ==== tests/cases/compiler/callOverloads2.ts (7 errors) ====
     
     
-    class Foo {    
+    class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
         bar1() { /*WScript.Echo("bar1");*/ }
@@ -20,17 +20,17 @@ tests/cases/compiler/callOverloads2.ts(24,1): error TS2348: Value of type 'typeo
         }
     }
     
-    function Foo();
-    ~~~~~~~~~~~~~~~
+    function Foo(); // error
+             ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
     
-    function F1(s:string) {return s;}
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2393: Duplicate function implementation.
+    function F1(s:string) {return s;} // error
              ~~
 !!! error TS2389: Function implementation name must be 'Foo'.
-    function F1(a:any) { return a;} // error -  duplicate identifier
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~
+!!! error TS2393: Duplicate function implementation.
+    function F1(a:any) { return a;} // error
+             ~~
 !!! error TS2393: Duplicate function implementation.
     
     function Goo(s:string); // error - no implementation
diff --git a/tests/baselines/reference/callOverloads2.js b/tests/baselines/reference/callOverloads2.js
index be42753bc3d..e3cbceb177a 100644
--- a/tests/baselines/reference/callOverloads2.js
+++ b/tests/baselines/reference/callOverloads2.js
@@ -1,7 +1,7 @@
 //// [callOverloads2.ts]
 
 
-class Foo {    
+class Foo { // error
     bar1() { /*WScript.Echo("bar1");*/ }
 
     constructor(x: any) {
@@ -9,10 +9,10 @@ class Foo {
     }
 }
 
-function Foo();
+function Foo(); // error
 
-function F1(s:string) {return s;}
-function F1(a:any) { return a;} // error -  duplicate identifier
+function F1(s:string) {return s;} // error
+function F1(a:any) { return a;} // error
 
 function Goo(s:string); // error - no implementation
 
@@ -36,10 +36,10 @@ var Foo = (function () {
 })();
 function F1(s) {
     return s;
-}
+} // error
 function F1(a) {
     return a;
-} // error -  duplicate identifier
+} // error
 var f1 = new Foo("hey");
 f1.bar1();
 Foo();
diff --git a/tests/baselines/reference/callOverloads3.errors.txt b/tests/baselines/reference/callOverloads3.errors.txt
index 86124251752..ecb889bc1ab 100644
--- a/tests/baselines/reference/callOverloads3.errors.txt
+++ b/tests/baselines/reference/callOverloads3.errors.txt
@@ -9,19 +9,19 @@ tests/cases/compiler/callOverloads3.ts(12,10): error TS2350: Only a void functio
 
 ==== tests/cases/compiler/callOverloads3.ts (7 errors) ====
     
-    function Foo():Foo;
+    function Foo():Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
                    ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-    function Foo(s:string):Foo;
+    function Foo(s:string):Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
                            ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-    class Foo {    
+    class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
         bar1() { /*WScript.Echo("bar1");*/ }
diff --git a/tests/baselines/reference/callOverloads3.js b/tests/baselines/reference/callOverloads3.js
index 93176cc1edb..85c16fe85a6 100644
--- a/tests/baselines/reference/callOverloads3.js
+++ b/tests/baselines/reference/callOverloads3.js
@@ -1,8 +1,8 @@
 //// [callOverloads3.ts]
 
-function Foo():Foo;
-function Foo(s:string):Foo;
-class Foo {    
+function Foo():Foo; // error
+function Foo(s:string):Foo; // error
+class Foo { // error
     bar1() { /*WScript.Echo("bar1");*/ }
     constructor(x: any) {
         // WScript.Echo("Constructor function has executed");
diff --git a/tests/baselines/reference/callOverloads4.errors.txt b/tests/baselines/reference/callOverloads4.errors.txt
index 24d304b45c6..3010d7c15d8 100644
--- a/tests/baselines/reference/callOverloads4.errors.txt
+++ b/tests/baselines/reference/callOverloads4.errors.txt
@@ -9,19 +9,19 @@ tests/cases/compiler/callOverloads4.ts(12,10): error TS2350: Only a void functio
 
 ==== tests/cases/compiler/callOverloads4.ts (7 errors) ====
     
-    function Foo():Foo;
+    function Foo():Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
                    ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-    function Foo(s:string):Foo;
+    function Foo(s:string):Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
                            ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-    class Foo {    
+    class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
         bar1() { /*WScript.Echo("bar1");*/ }
diff --git a/tests/baselines/reference/callOverloads4.js b/tests/baselines/reference/callOverloads4.js
index 86ec2b91e7e..6aab555b721 100644
--- a/tests/baselines/reference/callOverloads4.js
+++ b/tests/baselines/reference/callOverloads4.js
@@ -1,8 +1,8 @@
 //// [callOverloads4.ts]
 
-function Foo():Foo;
-function Foo(s:string):Foo;
-class Foo {    
+function Foo():Foo; // error
+function Foo(s:string):Foo; // error
+class Foo { // error
     bar1() { /*WScript.Echo("bar1");*/ }
     constructor(s: string);
     constructor(x: any) {
diff --git a/tests/baselines/reference/callOverloads5.errors.txt b/tests/baselines/reference/callOverloads5.errors.txt
index a2a8711d211..e521a9a9076 100644
--- a/tests/baselines/reference/callOverloads5.errors.txt
+++ b/tests/baselines/reference/callOverloads5.errors.txt
@@ -8,19 +8,19 @@ tests/cases/compiler/callOverloads5.ts(13,10): error TS2350: Only a void functio
 
 
 ==== tests/cases/compiler/callOverloads5.ts (7 errors) ====
-    function Foo():Foo;
+    function Foo():Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
                    ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-    function Foo(s:string):Foo;
+    function Foo(s:string):Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
                            ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-    class Foo {
+    class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
     	bar1(s:string);
diff --git a/tests/baselines/reference/callOverloads5.js b/tests/baselines/reference/callOverloads5.js
index 30cc65915ec..2220568e4c2 100644
--- a/tests/baselines/reference/callOverloads5.js
+++ b/tests/baselines/reference/callOverloads5.js
@@ -1,7 +1,7 @@
 //// [callOverloads5.ts]
-function Foo():Foo;
-function Foo(s:string):Foo;
-class Foo {
+function Foo():Foo; // error
+function Foo(s:string):Foo; // error
+class Foo { // error
 	bar1(s:string);
 	bar1(n:number);
     bar1(a:any) { /*WScript.Echo(a);*/ }
diff --git a/tests/baselines/reference/callSignaturesWithDuplicateParameters.errors.txt b/tests/baselines/reference/callSignaturesWithDuplicateParameters.errors.txt
index c87eb32515e..034aa4039cf 100644
--- a/tests/baselines/reference/callSignaturesWithDuplicateParameters.errors.txt
+++ b/tests/baselines/reference/callSignaturesWithDuplicateParameters.errors.txt
@@ -70,28 +70,28 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
     var f4 = <T>(x: T, x: T) => { }
                  ~
 !!! error TS2300: Duplicate identifier 'x'.
-                       ~~~~
+                       ~
 !!! error TS2300: Duplicate identifier 'x'.
     
     function foo2(x: string, x: number) { }
                   ~
 !!! error TS2300: Duplicate identifier 'x'.
-                             ~~~~~~~~~
+                             ~
 !!! error TS2300: Duplicate identifier 'x'.
     var f5 = function foo(x: string, x: number) { }
                           ~
 !!! error TS2300: Duplicate identifier 'x'.
-                                     ~~~~~~~~~
+                                     ~
 !!! error TS2300: Duplicate identifier 'x'.
     var f6 = function (x: string, x: number) { }
                        ~
 !!! error TS2300: Duplicate identifier 'x'.
-                                  ~~~~~~~~~
+                                  ~
 !!! error TS2300: Duplicate identifier 'x'.
     var f7 = (x: string, x: number) => { }
               ~
 !!! error TS2300: Duplicate identifier 'x'.
-                         ~~~~~~~~~
+                         ~
 !!! error TS2300: Duplicate identifier 'x'.
     var f8 = <T>(x: T, y: T) => { }
     
@@ -104,12 +104,12 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
         foo2(x: number, x: string) { }
              ~
 !!! error TS2300: Duplicate identifier 'x'.
-                        ~~~~~~~~~
+                        ~
 !!! error TS2300: Duplicate identifier 'x'.
         foo3<T>(x: T, x: T) { }
                 ~
 !!! error TS2300: Duplicate identifier 'x'.
-                      ~~~~
+                      ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -122,7 +122,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
         (x: string, x: number);
          ~
 !!! error TS2300: Duplicate identifier 'x'.
-                    ~~~~~~~~~
+                    ~
 !!! error TS2300: Duplicate identifier 'x'.
         foo(x, x);
             ~
@@ -132,12 +132,12 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
         foo(x: number, x: string);
             ~
 !!! error TS2300: Duplicate identifier 'x'.
-                       ~~~~~~~~~
+                       ~
 !!! error TS2300: Duplicate identifier 'x'.
         foo3<T>(x: T, x: T);
                 ~
 !!! error TS2300: Duplicate identifier 'x'.
-                      ~~~~
+                      ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -150,7 +150,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
         foo2(x: number, x: string);
              ~
 !!! error TS2300: Duplicate identifier 'x'.
-                        ~~~~~~~~~
+                        ~
 !!! error TS2300: Duplicate identifier 'x'.
     };
     
@@ -163,11 +163,11 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
         a: function foo(x: number, x: string) { },
                         ~
 !!! error TS2300: Duplicate identifier 'x'.
-                                   ~~~~~~~~~
+                                   ~
 !!! error TS2300: Duplicate identifier 'x'.
         b: <T>(x: T, x: T) => { }
                ~
 !!! error TS2300: Duplicate identifier 'x'.
-                     ~~~~
+                     ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt b/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
index 76bf9aec947..1801bd42e4d 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
@@ -29,13 +29,13 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWit
     c.foo(1);
     
     var b = {
-        foo(x = 1),
+        foo(x = 1), // error
                   ~
 !!! error TS1005: '{' expected.
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
-        foo(x = 1) { },
-        ~~~~~~~~~~~~~~
+        foo(x = 1) { }, // error
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     }
     
diff --git a/tests/baselines/reference/class1.errors.txt b/tests/baselines/reference/class1.errors.txt
index 13602645c45..b90fae9cb40 100644
--- a/tests/baselines/reference/class1.errors.txt
+++ b/tests/baselines/reference/class1.errors.txt
@@ -3,9 +3,9 @@ tests/cases/compiler/class1.ts(2,7): error TS2300: Duplicate identifier 'foo'.
 
 
 ==== tests/cases/compiler/class1.ts (2 errors) ====
-    interface foo{ }
+    interface foo{ } // error
               ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
-    class foo{ }
+    class foo{ } // error
           ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/class1.js b/tests/baselines/reference/class1.js
index 96b279e58c6..7a104e237b6 100644
--- a/tests/baselines/reference/class1.js
+++ b/tests/baselines/reference/class1.js
@@ -1,10 +1,10 @@
 //// [class1.ts]
-interface foo{ }
-class foo{ }
+interface foo{ } // error
+class foo{ } // error
 
 //// [class1.js]
 var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+})(); // error
diff --git a/tests/baselines/reference/classAndInterface1.errors.txt b/tests/baselines/reference/classAndInterface1.errors.txt
index a7a1b028d82..8d31e847d71 100644
--- a/tests/baselines/reference/classAndInterface1.errors.txt
+++ b/tests/baselines/reference/classAndInterface1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/classAndInterface1.ts(1,7): error TS2300: Duplicate identifier 'cli'.
+tests/cases/compiler/classAndInterface1.ts(1,8): error TS2300: Duplicate identifier 'cli'.
 tests/cases/compiler/classAndInterface1.ts(2,11): error TS2300: Duplicate identifier 'cli'.
 
 
 ==== tests/cases/compiler/classAndInterface1.ts (2 errors) ====
-    class cli { }
-          ~~~
+     class cli { } // error
+           ~~~
 !!! error TS2300: Duplicate identifier 'cli'.
     interface cli { } // error
               ~~~
diff --git a/tests/baselines/reference/classAndInterface1.js b/tests/baselines/reference/classAndInterface1.js
index 74eec3e942e..5efabded838 100644
--- a/tests/baselines/reference/classAndInterface1.js
+++ b/tests/baselines/reference/classAndInterface1.js
@@ -1,5 +1,5 @@
 //// [classAndInterface1.ts]
-class cli { }
+ class cli { } // error
 interface cli { } // error
 
 //// [classAndInterface1.js]
@@ -7,4 +7,4 @@ var cli = (function () {
     function cli() {
     }
     return cli;
-})();
+})(); // error
diff --git a/tests/baselines/reference/classAndVariableWithSameName.errors.txt b/tests/baselines/reference/classAndVariableWithSameName.errors.txt
index 909ea253926..2e8c16d4494 100644
--- a/tests/baselines/reference/classAndVariableWithSameName.errors.txt
+++ b/tests/baselines/reference/classAndVariableWithSameName.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.t
 
 
 ==== tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.ts (4 errors) ====
-    class C { foo: string; }
+    class C { foo: string; } // error
           ~
 !!! error TS2300: Duplicate identifier 'C'.
     var C = ''; // error
@@ -13,7 +13,7 @@ tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.t
 !!! error TS2300: Duplicate identifier 'C'.
     
     module M {
-        class D {
+        class D { // error
               ~
 !!! error TS2300: Duplicate identifier 'D'.
             bar: string;
diff --git a/tests/baselines/reference/classAndVariableWithSameName.js b/tests/baselines/reference/classAndVariableWithSameName.js
index ab17905d5b2..1d547dc5508 100644
--- a/tests/baselines/reference/classAndVariableWithSameName.js
+++ b/tests/baselines/reference/classAndVariableWithSameName.js
@@ -1,9 +1,9 @@
 //// [classAndVariableWithSameName.ts]
-class C { foo: string; }
+class C { foo: string; } // error
 var C = ''; // error
 
 module M {
-    class D {
+    class D { // error
         bar: string;
     }
 
@@ -15,7 +15,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+})(); // error
 var C = ''; // error
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/classOverloadForFunction.errors.txt b/tests/baselines/reference/classOverloadForFunction.errors.txt
index c52da033a2c..14bc27fb5ca 100644
--- a/tests/baselines/reference/classOverloadForFunction.errors.txt
+++ b/tests/baselines/reference/classOverloadForFunction.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/classOverloadForFunction.ts(1,7): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/classOverloadForFunction.ts(2,1): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/classOverloadForFunction.ts(2,10): error TS2300: Duplicate identifier 'foo'.
 
 
 ==== tests/cases/compiler/classOverloadForFunction.ts (2 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/classOverloadForFunction.ts(2,1): error TS2300: Duplicate i
           ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     function foo() {}
-    ~~~~~~~~~~~~~~~~~
+             ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classWithTwoConstructorDefinitions.errors.txt b/tests/baselines/reference/classWithTwoConstructorDefinitions.errors.txt
index fa093b91c2d..6b08be330a0 100644
--- a/tests/baselines/reference/classWithTwoConstructorDefinitions.errors.txt
+++ b/tests/baselines/reference/classWithTwoConstructorDefinitions.errors.txt
@@ -6,7 +6,7 @@ tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorD
 
 ==== tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorDefinitions.ts (4 errors) ====
     class C {
-        constructor() { }
+        constructor() { } // error
         ~~~~~~~~~~~~~~~~~
 !!! error TS2392: Multiple constructor implementations are not allowed.
         constructor(x) { } // error
@@ -15,7 +15,7 @@ tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorD
     }
     
     class D<T> {
-        constructor(x: T) { }
+        constructor(x: T) { } // error
         ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2392: Multiple constructor implementations are not allowed.
         constructor(x: T, y: T) { } // error
diff --git a/tests/baselines/reference/classWithTwoConstructorDefinitions.js b/tests/baselines/reference/classWithTwoConstructorDefinitions.js
index 77c98697f1f..31e5498cfc9 100644
--- a/tests/baselines/reference/classWithTwoConstructorDefinitions.js
+++ b/tests/baselines/reference/classWithTwoConstructorDefinitions.js
@@ -1,22 +1,22 @@
 //// [classWithTwoConstructorDefinitions.ts]
 class C {
-    constructor() { }
+    constructor() { } // error
     constructor(x) { } // error
 }
 
 class D<T> {
-    constructor(x: T) { }
+    constructor(x: T) { } // error
     constructor(x: T, y: T) { } // error
 }
 
 //// [classWithTwoConstructorDefinitions.js]
 var C = (function () {
     function C() {
-    }
+    } // error
     return C;
 })();
 var D = (function () {
     function D(x) {
-    }
+    } // error
     return D;
 })();
diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt b/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt
index 901affa2554..914088f6c19 100644
--- a/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt
+++ b/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt
@@ -3,8 +3,8 @@ tests/cases/compiler/cloduleWithDuplicateMember1.ts(3,16): error TS1056: Accesso
 tests/cases/compiler/cloduleWithDuplicateMember1.ts(3,16): error TS2300: Duplicate identifier 'x'.
 tests/cases/compiler/cloduleWithDuplicateMember1.ts(6,12): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/cloduleWithDuplicateMember1.ts(10,16): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/cloduleWithDuplicateMember1.ts(13,5): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/cloduleWithDuplicateMember1.ts(14,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/cloduleWithDuplicateMember1.ts(13,21): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/cloduleWithDuplicateMember1.ts(14,21): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/compiler/cloduleWithDuplicateMember1.ts (7 errors) ====
@@ -31,9 +31,9 @@ tests/cases/compiler/cloduleWithDuplicateMember1.ts(14,5): error TS2300: Duplica
     }
     module C {
         export function foo() { }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         export function x() { }
-        ~~~~~~~~~~~~~~~~~~~~~~~
+                        ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt b/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt
index d8702a546d0..55d2fdbddf2 100644
--- a/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt
+++ b/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/cloduleWithDuplicateMember2.ts(2,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/cloduleWithDuplicateMember2.ts(3,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/cloduleWithDuplicateMember2.ts(7,16): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/cloduleWithDuplicateMember2.ts(10,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/cloduleWithDuplicateMember2.ts(10,21): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/compiler/cloduleWithDuplicateMember2.ts (4 errors) ====
@@ -21,6 +21,6 @@ tests/cases/compiler/cloduleWithDuplicateMember2.ts(10,5): error TS2300: Duplica
     }
     module C {
         export function x() { }
-        ~~~~~~~~~~~~~~~~~~~~~~~
+                        ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt b/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
index 080167cd760..0b667108b5f 100644
--- a/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
+++ b/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(1,5): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,1): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,10): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,1): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,10): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
 
 
@@ -10,12 +10,12 @@ tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,17): error TS2355: A funct
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     function foo(): number { }
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
                     ~~~~~~
 !!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
     function foo(): number { }
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
                     ~~~~~~
 !!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.errors.txt b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.errors.txt
index e3d17237f1d..e12f3a59ca1 100644
--- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.errors.txt
+++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.errors.txt
@@ -2,11 +2,11 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatur
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(4,24): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(4,27): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(4,35): error TS2300: Duplicate identifier 'y'.
-tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(5,17): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(5,27): error TS2300: Duplicate identifier 'y'.
+tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(5,24): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(5,35): error TS2300: Duplicate identifier 'y'.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(9,17): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(9,25): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(10,17): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(10,24): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(14,17): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(19,10): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts(20,10): error TS2369: A parameter property is only allowed in a constructor implementation.
@@ -32,9 +32,9 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatur
                                       ~
 !!! error TS2300: Duplicate identifier 'y'.
         constructor(public x, private y) { }
-                    ~~~~~~~~
+                           ~
 !!! error TS2300: Duplicate identifier 'x'.
-                              ~~~~~~~~~
+                                      ~
 !!! error TS2300: Duplicate identifier 'y'.
     }
     
@@ -45,7 +45,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatur
                             ~
 !!! error TS2300: Duplicate identifier 'x'.
         constructor(public x) { }
-                    ~~~~~~~~
+                           ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
diff --git a/tests/baselines/reference/constructorOverloads4.errors.txt b/tests/baselines/reference/constructorOverloads4.errors.txt
index 31c82ed5237..d2cc5ecd65b 100644
--- a/tests/baselines/reference/constructorOverloads4.errors.txt
+++ b/tests/baselines/reference/constructorOverloads4.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/constructorOverloads4.ts(2,18): error TS2300: Duplicate identifier 'Function'.
-tests/cases/compiler/constructorOverloads4.ts(5,5): error TS2300: Duplicate identifier 'Function'.
-tests/cases/compiler/constructorOverloads4.ts(6,5): error TS2300: Duplicate identifier 'Function'.
+tests/cases/compiler/constructorOverloads4.ts(5,21): error TS2300: Duplicate identifier 'Function'.
+tests/cases/compiler/constructorOverloads4.ts(6,21): error TS2300: Duplicate identifier 'Function'.
 tests/cases/compiler/constructorOverloads4.ts(10,1): error TS2349: Cannot invoke an expression whose type lacks a call signature.
 tests/cases/compiler/constructorOverloads4.ts(11,1): error TS2348: Value of type 'typeof Function' is not callable. Did you mean to include 'new'?
 
@@ -13,10 +13,10 @@ tests/cases/compiler/constructorOverloads4.ts(11,1): error TS2348: Value of type
             constructor(...args: string[]);
         }
         export function Function(...args: any[]): any;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~~~~~~
 !!! error TS2300: Duplicate identifier 'Function'.
         export function Function(...args: string[]): Function;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~~~~~~
 !!! error TS2300: Duplicate identifier 'Function'.
     }
     
diff --git a/tests/baselines/reference/constructorOverloads7.errors.txt b/tests/baselines/reference/constructorOverloads7.errors.txt
index b7ad6d427b8..e3409dbb399 100644
--- a/tests/baselines/reference/constructorOverloads7.errors.txt
+++ b/tests/baselines/reference/constructorOverloads7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/constructorOverloads7.ts(1,15): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/constructorOverloads7.ts(15,1): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/constructorOverloads7.ts(15,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/constructorOverloads7.ts(22,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 
 
@@ -21,18 +21,13 @@ tests/cases/compiler/constructorOverloads7.ts(22,18): error TS2384: Overload sig
     // Because Point is a constructor function, this is inferred
     // to be Point and return type is inferred to be void
     function Point(x, y) {
-    ~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~
+!!! error TS2300: Duplicate identifier 'Point'.
         this.x = x;
-    ~~~~~~~~~~~~~~~
         this.y = y;
-    ~~~~~~~~~~~~~~~
-    
     
         return this;
-    ~~~~~~~~~~~~~~~~
     }
-    ~
-!!! error TS2300: Duplicate identifier 'Point'.
     
     declare function EF1(a:number, b:number):number;
                      ~~~
diff --git a/tests/baselines/reference/constructorParameterProperties2.errors.txt b/tests/baselines/reference/constructorParameterProperties2.errors.txt
index 8a51ad82682..42df015bc5b 100644
--- a/tests/baselines/reference/constructorParameterProperties2.errors.txt
+++ b/tests/baselines/reference/constructorParameterProperties2.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(10,5): error TS2300: Duplicate identifier 'y'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(11,17): error TS2300: Duplicate identifier 'y'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(11,24): error TS2300: Duplicate identifier 'y'.
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(18,5): error TS2300: Duplicate identifier 'y'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(19,17): error TS2300: Duplicate identifier 'y'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(19,25): error TS2300: Duplicate identifier 'y'.
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(26,5): error TS2300: Duplicate identifier 'y'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(27,17): error TS2300: Duplicate identifier 'y'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(27,27): error TS2300: Duplicate identifier 'y'.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts (6 errors) ====
@@ -20,7 +20,7 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
         ~
 !!! error TS2300: Duplicate identifier 'y'.
         constructor(public y: number) { } // error
-                    ~~~~~~~~~~~~~~~~
+                           ~
 !!! error TS2300: Duplicate identifier 'y'.
     }
     
@@ -32,7 +32,7 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
         ~
 !!! error TS2300: Duplicate identifier 'y'.
         constructor(private y: number) { } // error
-                    ~~~~~~~~~~~~~~~~~
+                            ~
 !!! error TS2300: Duplicate identifier 'y'.
     }
     
@@ -44,7 +44,7 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
         ~
 !!! error TS2300: Duplicate identifier 'y'.
         constructor(protected y: number) { } // error
-                    ~~~~~~~~~~~~~~~~~~~
+                              ~
 !!! error TS2300: Duplicate identifier 'y'.
     }
     
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index 630da5a903d..ed6e50c1dbd 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/contextualTyping.ts(189,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/compiler/contextualTyping.ts(197,15): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/contextualTyping.ts(207,1): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/contextualTyping.ts(207,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/contextualTyping.ts(230,5): error TS2322: Type '{}' is not assignable to type 'B':\n  Property 'x' is missing in type '{}'.
 
 
@@ -216,18 +216,13 @@ tests/cases/compiler/contextualTyping.ts(230,5): error TS2322: Type '{}' is not
     }
     
     function Point(x, y) {
-    ~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~
+!!! error TS2300: Duplicate identifier 'Point'.
         this.x = x;
-    ~~~~~~~~~~~~~~~
         this.y = y;
-    ~~~~~~~~~~~~~~~
-    
     
         return this;
-    ~~~~~~~~~~~~~~~~
     }
-    ~
-!!! error TS2300: Duplicate identifier 'Point'.
     
     Point.origin = new Point(0, 0);
     
diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt
index dcbde21e670..7212121e106 100644
--- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt
+++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt
@@ -54,6 +54,6 @@ tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceIncompa
     
     interface Derived5 extends Base {
         '1': { x: number } // error
-        ~~~~~~~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier ''1''.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateClassElements.errors.txt b/tests/baselines/reference/duplicateClassElements.errors.txt
index ee9fb937004..004e68314fd 100644
--- a/tests/baselines/reference/duplicateClassElements.errors.txt
+++ b/tests/baselines/reference/duplicateClassElements.errors.txt
@@ -9,21 +9,21 @@ tests/cases/compiler/duplicateClassElements.ts(32,9): error TS1056: Accessors ar
 tests/cases/compiler/duplicateClassElements.ts(36,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/duplicateClassElements.ts(39,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/duplicateClassElements.ts(2,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/duplicateClassElements.ts(3,5): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/duplicateClassElements.ts(4,5): error TS2393: Duplicate function implementation.
-tests/cases/compiler/duplicateClassElements.ts(6,5): error TS2393: Duplicate function implementation.
+tests/cases/compiler/duplicateClassElements.ts(3,12): error TS2300: Duplicate identifier 'a'.
+tests/cases/compiler/duplicateClassElements.ts(4,12): error TS2393: Duplicate function implementation.
+tests/cases/compiler/duplicateClassElements.ts(6,12): error TS2393: Duplicate function implementation.
 tests/cases/compiler/duplicateClassElements.ts(8,12): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/duplicateClassElements.ts(9,5): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/duplicateClassElements.ts(12,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/duplicateClassElements.ts(9,9): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/duplicateClassElements.ts(12,9): error TS2300: Duplicate identifier 'x'.
 tests/cases/compiler/duplicateClassElements.ts(21,12): error TS2300: Duplicate identifier 'z'.
-tests/cases/compiler/duplicateClassElements.ts(23,5): error TS2300: Duplicate identifier 'z'.
-tests/cases/compiler/duplicateClassElements.ts(26,5): error TS2300: Duplicate identifier 'z'.
+tests/cases/compiler/duplicateClassElements.ts(23,9): error TS2300: Duplicate identifier 'z'.
+tests/cases/compiler/duplicateClassElements.ts(26,9): error TS2300: Duplicate identifier 'z'.
 tests/cases/compiler/duplicateClassElements.ts(29,9): error TS2300: Duplicate identifier 'x2'.
 tests/cases/compiler/duplicateClassElements.ts(32,9): error TS2300: Duplicate identifier 'x2'.
-tests/cases/compiler/duplicateClassElements.ts(34,5): error TS2300: Duplicate identifier 'x2'.
+tests/cases/compiler/duplicateClassElements.ts(34,12): error TS2300: Duplicate identifier 'x2'.
 tests/cases/compiler/duplicateClassElements.ts(36,9): error TS2300: Duplicate identifier 'z2'.
 tests/cases/compiler/duplicateClassElements.ts(39,9): error TS2300: Duplicate identifier 'z2'.
-tests/cases/compiler/duplicateClassElements.ts(41,5): error TS2300: Duplicate identifier 'z2'.
+tests/cases/compiler/duplicateClassElements.ts(41,12): error TS2300: Duplicate identifier 'z2'.
 
 
 ==== tests/cases/compiler/duplicateClassElements.ts (26 errors) ====
@@ -32,37 +32,32 @@ tests/cases/compiler/duplicateClassElements.ts(41,5): error TS2300: Duplicate id
                ~
 !!! error TS2300: Duplicate identifier 'a'.
         public a;
-        ~~~~~~~~~
+               ~
 !!! error TS2300: Duplicate identifier 'a'.
         public b() {
-        ~~~~~~~~~~~~
-        }
-    ~~~~~
+               ~
 !!! error TS2393: Duplicate function implementation.
+        }
         public b() {
-        ~~~~~~~~~~~~
-        }
-    ~~~~~
+               ~
 !!! error TS2393: Duplicate function implementation.
+        }
         public x;
                ~
 !!! error TS2300: Duplicate identifier 'x'.
         get x() {
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~
-            return 10;
-    ~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
+            return 10;
+        }
         set x(_x: number) {
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
+        }
     
         get y() {
             ~
@@ -81,19 +76,16 @@ tests/cases/compiler/duplicateClassElements.ts(41,5): error TS2300: Duplicate id
         get z() {
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~
-            return "Hello";
-    ~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'z'.
+            return "Hello";
+        }
         set z(_y: string) {
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'z'.
+        }
     
         get x2() {
             ~~
@@ -109,7 +101,7 @@ tests/cases/compiler/duplicateClassElements.ts(41,5): error TS2300: Duplicate id
 !!! error TS2300: Duplicate identifier 'x2'.
         }
         public x2;
-        ~~~~~~~~~~
+               ~~
 !!! error TS2300: Duplicate identifier 'x2'.
     
         get z2() {
@@ -126,9 +118,8 @@ tests/cases/compiler/duplicateClassElements.ts(41,5): error TS2300: Duplicate id
 !!! error TS2300: Duplicate identifier 'z2'.
         }
         public z2() {
-        ~~~~~~~~~~~~~
-        }
-    ~~~~~
+               ~~
 !!! error TS2300: Duplicate identifier 'z2'.
+        }
     
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateIdentifierInCatchBlock.errors.txt b/tests/baselines/reference/duplicateIdentifierInCatchBlock.errors.txt
index 7c43bc81289..d8065df27c8 100644
--- a/tests/baselines/reference/duplicateIdentifierInCatchBlock.errors.txt
+++ b/tests/baselines/reference/duplicateIdentifierInCatchBlock.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(1,5): error TS2300: Duplicate identifier 'v'.
-tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(3,5): error TS2300: Duplicate identifier 'v'.
+tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(3,14): error TS2300: Duplicate identifier 'v'.
 tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(6,10): error TS2300: Duplicate identifier 'w'.
 tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(8,9): error TS2300: Duplicate identifier 'w'.
 tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(12,9): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(13,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(13,14): error TS2300: Duplicate identifier 'x'.
 tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(16,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'string', but here has type 'number'.
 
 
@@ -13,7 +13,7 @@ tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(16,9): error TS2403: Sub
 !!! error TS2300: Duplicate identifier 'v'.
     try { } catch (e) {
         function v() { }
-        ~~~~~~~~~~~~~~~~
+                 ~
 !!! error TS2300: Duplicate identifier 'v'.
     }
     
@@ -31,7 +31,7 @@ tests/cases/compiler/duplicateIdentifierInCatchBlock.ts(16,9): error TS2403: Sub
             ~
 !!! error TS2300: Duplicate identifier 'x'.
         function x() { } // error
-        ~~~~~~~~~~~~~~~~
+                 ~
 !!! error TS2300: Duplicate identifier 'x'.
         function e() { } // error
         var p: string;
diff --git a/tests/baselines/reference/duplicateInterfaceMembers1.errors.txt b/tests/baselines/reference/duplicateInterfaceMembers1.errors.txt
index 5920064dd99..674d4f601e6 100644
--- a/tests/baselines/reference/duplicateInterfaceMembers1.errors.txt
+++ b/tests/baselines/reference/duplicateInterfaceMembers1.errors.txt
@@ -8,7 +8,7 @@ tests/cases/compiler/duplicateInterfaceMembers1.ts(3,4): error TS2300: Duplicate
        ~
 !!! error TS2300: Duplicate identifier 'x'.
        x: number;
-       ~~~~~~~~~~
+       ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt b/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
index 6ea3a636ab8..4c3f6d1eb7e 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
@@ -10,7 +10,7 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(7,9): error TS2300: Dupli
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(8,9): error TS2300: Duplicate identifier '"c"'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(14,9): error TS2300: Duplicate identifier 'a'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(15,9): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,5): error TS2300: Duplicate identifier 'a'.
+tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS2300: Duplicate identifier 'a'.
 
 
 ==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (13 errors) ====
@@ -20,24 +20,21 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,5): error TS2300: Dupl
 !!! error TS2300: Duplicate identifier 'a'.
         b: true, // OK
         a: 56,   // Duplicate
-        ~~~~~
+        ~
 !!! error TS2300: Duplicate identifier 'a'.
         \u0061: "ss", // Duplicate
-        ~~~~~~~~~~~~
+        ~~~~~~
 !!! error TS2300: Duplicate identifier '\u0061'.
         a: {
-        ~~~~
+        ~
+!!! error TS2300: Duplicate identifier 'a'.
             c: 1,
-    ~~~~~~~~~~~~~
             ~
 !!! error TS2300: Duplicate identifier 'c'.
             "c": 56, // Duplicate
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            ~~~~~~~
+            ~~~
 !!! error TS2300: Duplicate identifier '"c"'.
         }
-    ~~~~~
-!!! error TS2300: Duplicate identifier 'a'.
     };
     
     
@@ -57,7 +54,7 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,5): error TS2300: Dupl
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             ~
 !!! error TS1118: An object literal cannot have multiple get/set accessors with the same name.
-        ~~~~~~~~~~~~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'a'.
     };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt b/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
index 50b29eff93a..6ae8518677d 100644
--- a/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
+++ b/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
@@ -12,6 +12,6 @@ tests/cases/compiler/duplicatePropertiesInStrictMode.ts(4,3): error TS2300: Dupl
       x: 2
       ~
 !!! error TS1117: An object literal cannot have multiple properties with the same name in strict mode.
-      ~~~~
+      ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicatePropertyNames.errors.txt b/tests/baselines/reference/duplicatePropertyNames.errors.txt
index 6ed93382aef..108a88d1451 100644
--- a/tests/baselines/reference/duplicatePropertyNames.errors.txt
+++ b/tests/baselines/reference/duplicatePropertyNames.errors.txt
@@ -28,7 +28,7 @@ tests/cases/conformance/types/members/duplicatePropertyNames.ts(46,5): error TS2
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         foo: string;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     }
     
@@ -42,7 +42,7 @@ tests/cases/conformance/types/members/duplicatePropertyNames.ts(46,5): error TS2
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         foo: T;
-        ~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     }
     
@@ -51,21 +51,21 @@ tests/cases/conformance/types/members/duplicatePropertyNames.ts(46,5): error TS2
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         foo: string;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     
         bar(x) { }
-        ~~~~~~~~~~
+        ~~~
 !!! error TS2393: Duplicate function implementation.
         bar(x) { }
-        ~~~~~~~~~~
+        ~~~
 !!! error TS2393: Duplicate function implementation.
     
         baz = () => { }
         ~~~
 !!! error TS2300: Duplicate identifier 'baz'.
         baz = () => { }
-        ~~~~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'baz'.
     }
     
@@ -74,7 +74,7 @@ tests/cases/conformance/types/members/duplicatePropertyNames.ts(46,5): error TS2
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         foo: string;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     }
     
@@ -83,14 +83,14 @@ tests/cases/conformance/types/members/duplicatePropertyNames.ts(46,5): error TS2
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         foo: string;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     
         bar: () => {};
         ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
         bar: () => {};
-        ~~~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
     }
     
@@ -99,13 +99,13 @@ tests/cases/conformance/types/members/duplicatePropertyNames.ts(46,5): error TS2
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         foo: '',
-        ~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
         bar: () => { },
         ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
         bar: () => { }
-        ~~~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.errors.txt b/tests/baselines/reference/duplicateStringNamedProperty1.errors.txt
index 38652e37f10..7d6c5d6bafc 100644
--- a/tests/baselines/reference/duplicateStringNamedProperty1.errors.txt
+++ b/tests/baselines/reference/duplicateStringNamedProperty1.errors.txt
@@ -8,6 +8,6 @@ tests/cases/compiler/duplicateStringNamedProperty1.ts(3,5): error TS2300: Duplic
         ~~~~~~~~
 !!! error TS2300: Duplicate identifier '"artist"'.
         artist: string;
-        ~~~~~~~~~~~~~~~
+        ~~~~~~
 !!! error TS2300: Duplicate identifier 'artist'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ClassTest9.errors.txt b/tests/baselines/reference/es6ClassTest9.errors.txt
index d8af974a176..ae7d1ba92d5 100644
--- a/tests/baselines/reference/es6ClassTest9.errors.txt
+++ b/tests/baselines/reference/es6ClassTest9.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/es6ClassTest9.ts(1,18): error TS1005: '{' expected.
 tests/cases/compiler/es6ClassTest9.ts(1,19): error TS1109: Expression expected.
 tests/cases/compiler/es6ClassTest9.ts(1,15): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/es6ClassTest9.ts(2,1): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/es6ClassTest9.ts(2,10): error TS2300: Duplicate identifier 'foo'.
 
 
 ==== tests/cases/compiler/es6ClassTest9.ts (4 errors) ====
@@ -13,6 +13,6 @@ tests/cases/compiler/es6ClassTest9.ts(2,1): error TS2300: Duplicate identifier '
                   ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     function foo() {}
-    ~~~~~~~~~~~~~~~~~
+             ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/exportSameNameFuncVar.errors.txt b/tests/baselines/reference/exportSameNameFuncVar.errors.txt
index 4d6d835b13b..a06457e88ae 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.errors.txt
+++ b/tests/baselines/reference/exportSameNameFuncVar.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/exportSameNameFuncVar.ts(1,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/exportSameNameFuncVar.ts(2,1): error TS2300: Duplicate identifier 'a'.
+tests/cases/compiler/exportSameNameFuncVar.ts(2,17): error TS2300: Duplicate identifier 'a'.
 
 
 ==== tests/cases/compiler/exportSameNameFuncVar.ts (2 errors) ====
@@ -7,7 +7,6 @@ tests/cases/compiler/exportSameNameFuncVar.ts(2,1): error TS2300: Duplicate iden
                ~
 !!! error TS2300: Duplicate identifier 'a'.
     export function a() {
-    ~~~~~~~~~~~~~~~~~~~~~
-    }
-    ~
-!!! error TS2300: Duplicate identifier 'a'.
\ No newline at end of file
+                    ~
+!!! error TS2300: Duplicate identifier 'a'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.errors.txt b/tests/baselines/reference/fieldAndGetterWithSameName.errors.txt
index 34b6ea08e09..dd2374f2447 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.errors.txt
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/fieldAndGetterWithSameName.ts(3,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/fieldAndGetterWithSameName.ts(2,5): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/fieldAndGetterWithSameName.ts(3,3): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/fieldAndGetterWithSameName.ts(3,7): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/compiler/fieldAndGetterWithSameName.ts (3 errors) ====
@@ -11,6 +11,6 @@ tests/cases/compiler/fieldAndGetterWithSameName.ts(3,3): error TS2300: Duplicate
       get x(): number { return 1; }
           ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+          ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/funClodule.errors.txt b/tests/baselines/reference/funClodule.errors.txt
index 9a4f6c27224..72a9ed0db51 100644
--- a/tests/baselines/reference/funClodule.errors.txt
+++ b/tests/baselines/reference/funClodule.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/funClodule.ts(2,16): error TS2300: Duplicate identifier 'fo
 tests/cases/compiler/funClodule.ts(5,15): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/funClodule.ts(8,15): error TS2300: Duplicate identifier 'foo2'.
 tests/cases/compiler/funClodule.ts(9,16): error TS2300: Duplicate identifier 'foo2'.
-tests/cases/compiler/funClodule.ts(12,1): error TS2300: Duplicate identifier 'foo2'.
+tests/cases/compiler/funClodule.ts(12,18): error TS2300: Duplicate identifier 'foo2'.
 tests/cases/compiler/funClodule.ts(15,10): error TS2300: Duplicate identifier 'foo3'.
 tests/cases/compiler/funClodule.ts(16,8): error TS2300: Duplicate identifier 'foo3'.
 tests/cases/compiler/funClodule.ts(19,7): error TS2300: Duplicate identifier 'foo3'.
@@ -32,7 +32,7 @@ tests/cases/compiler/funClodule.ts(19,7): error TS2300: Duplicate identifier 'fo
         export function x(): any;
     }
     declare function foo2(); // Should error
-    ~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~
 !!! error TS2300: Duplicate identifier 'foo2'.
     
     
diff --git a/tests/baselines/reference/functionAndPropertyNameConflict.errors.txt b/tests/baselines/reference/functionAndPropertyNameConflict.errors.txt
index 1e246184fb1..640844064c4 100644
--- a/tests/baselines/reference/functionAndPropertyNameConflict.errors.txt
+++ b/tests/baselines/reference/functionAndPropertyNameConflict.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/functionAndPropertyNameConflict.ts(3,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/functionAndPropertyNameConflict.ts(2,12): error TS2300: Duplicate identifier 'aaaaa'.
-tests/cases/compiler/functionAndPropertyNameConflict.ts(3,5): error TS2300: Duplicate identifier 'aaaaa'.
+tests/cases/compiler/functionAndPropertyNameConflict.ts(3,16): error TS2300: Duplicate identifier 'aaaaa'.
 
 
 ==== tests/cases/compiler/functionAndPropertyNameConflict.ts (3 errors) ====
@@ -11,10 +11,8 @@ tests/cases/compiler/functionAndPropertyNameConflict.ts(3,5): error TS2300: Dupl
         public get aaaaa() {
                    ~~~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~
-            return 1;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+                   ~~~~~
 !!! error TS2300: Duplicate identifier 'aaaaa'.
+            return 1;
+        }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/functionCall15.errors.txt b/tests/baselines/reference/functionCall15.errors.txt
index 3d170c34fa0..4b6acf34e14 100644
--- a/tests/baselines/reference/functionCall15.errors.txt
+++ b/tests/baselines/reference/functionCall15.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/functionCall15.ts(1,25): error TS2300: Duplicate identifier 'b'.
-tests/cases/compiler/functionCall15.ts(1,36): error TS2300: Duplicate identifier 'b'.
+tests/cases/compiler/functionCall15.ts(1,39): error TS2300: Duplicate identifier 'b'.
 
 
 ==== tests/cases/compiler/functionCall15.ts (2 errors) ====
     function foo(a?:string, b?:number, ...b:number[]){}
                             ~
 !!! error TS2300: Duplicate identifier 'b'.
-                                       ~~~~~~~~~~~~~
+                                          ~
 !!! error TS2300: Duplicate identifier 'b'.
\ No newline at end of file
diff --git a/tests/baselines/reference/functionNameConflicts.errors.txt b/tests/baselines/reference/functionNameConflicts.errors.txt
index cf37103eed5..86fa348d817 100644
--- a/tests/baselines/reference/functionNameConflicts.errors.txt
+++ b/tests/baselines/reference/functionNameConflicts.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/functions/functionNameConflicts.ts(5,14): error TS2300: Duplicate identifier 'fn1'.
 tests/cases/conformance/functions/functionNameConflicts.ts(6,9): error TS2300: Duplicate identifier 'fn1'.
 tests/cases/conformance/functions/functionNameConflicts.ts(8,9): error TS2300: Duplicate identifier 'fn2'.
-tests/cases/conformance/functions/functionNameConflicts.ts(9,5): error TS2300: Duplicate identifier 'fn2'.
+tests/cases/conformance/functions/functionNameConflicts.ts(9,14): error TS2300: Duplicate identifier 'fn2'.
 tests/cases/conformance/functions/functionNameConflicts.ts(12,10): error TS2300: Duplicate identifier 'fn3'.
 tests/cases/conformance/functions/functionNameConflicts.ts(13,5): error TS2300: Duplicate identifier 'fn3'.
 tests/cases/conformance/functions/functionNameConflicts.ts(16,9): error TS2300: Duplicate identifier 'fn4'.
-tests/cases/conformance/functions/functionNameConflicts.ts(17,5): error TS2300: Duplicate identifier 'fn4'.
+tests/cases/conformance/functions/functionNameConflicts.ts(17,14): error TS2300: Duplicate identifier 'fn4'.
 tests/cases/conformance/functions/functionNameConflicts.ts(19,14): error TS2300: Duplicate identifier 'fn5'.
 tests/cases/conformance/functions/functionNameConflicts.ts(20,9): error TS2300: Duplicate identifier 'fn5'.
 tests/cases/conformance/functions/functionNameConflicts.ts(24,10): error TS2389: Function implementation name must be 'over'.
@@ -27,7 +27,7 @@ tests/cases/conformance/functions/functionNameConflicts.ts(24,10): error TS2389:
             ~~~
 !!! error TS2300: Duplicate identifier 'fn2'.
         function fn2() { }
-        ~~~~~~~~~~~~~~~~~~
+                 ~~~
 !!! error TS2300: Duplicate identifier 'fn2'.
     }
     
@@ -43,7 +43,7 @@ tests/cases/conformance/functions/functionNameConflicts.ts(24,10): error TS2389:
             ~~~
 !!! error TS2300: Duplicate identifier 'fn4'.
         function fn4() { }
-        ~~~~~~~~~~~~~~~~~~
+                 ~~~
 !!! error TS2300: Duplicate identifier 'fn4'.
     
         function fn5() { }
diff --git a/tests/baselines/reference/functionWithSameNameAsField.errors.txt b/tests/baselines/reference/functionWithSameNameAsField.errors.txt
index 4dd114c8872..168b9191df4 100644
--- a/tests/baselines/reference/functionWithSameNameAsField.errors.txt
+++ b/tests/baselines/reference/functionWithSameNameAsField.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/functionWithSameNameAsField.ts(2,12): error TS2300: Duplicate identifier 'total'.
-tests/cases/compiler/functionWithSameNameAsField.ts(3,5): error TS2300: Duplicate identifier 'total'.
+tests/cases/compiler/functionWithSameNameAsField.ts(3,12): error TS2300: Duplicate identifier 'total'.
 
 
 ==== tests/cases/compiler/functionWithSameNameAsField.ts (2 errors) ====
@@ -8,13 +8,10 @@ tests/cases/compiler/functionWithSameNameAsField.ts(3,5): error TS2300: Duplicat
                ~~~~~
 !!! error TS2300: Duplicate identifier 'total'.
         public total(total: number) {
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            this.total = total;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            return this;
-    ~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+               ~~~~~
 !!! error TS2300: Duplicate identifier 'total'.
+            this.total = total;
+            return this;
+        }
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/gettersAndSettersErrors.errors.txt b/tests/baselines/reference/gettersAndSettersErrors.errors.txt
index 1cc033cde04..95fb571d9b8 100644
--- a/tests/baselines/reference/gettersAndSettersErrors.errors.txt
+++ b/tests/baselines/reference/gettersAndSettersErrors.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/gettersAndSettersErrors.ts(11,17): error TS1056: Accessors
 tests/cases/compiler/gettersAndSettersErrors.ts(12,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/gettersAndSettersErrors.ts(2,16): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/gettersAndSettersErrors.ts(3,16): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/gettersAndSettersErrors.ts(5,5): error TS2300: Duplicate identifier 'Foo'.
+tests/cases/compiler/gettersAndSettersErrors.ts(5,12): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/gettersAndSettersErrors.ts(11,17): error TS2379: Getter and setter accessors do not agree in visibility.
 tests/cases/compiler/gettersAndSettersErrors.ts(12,16): error TS2379: Getter and setter accessors do not agree in visibility.
 
@@ -25,7 +25,7 @@ tests/cases/compiler/gettersAndSettersErrors.ts(12,16): error TS2379: Getter and
 !!! error TS2300: Duplicate identifier 'Foo'.
     
         public Foo = 0; // error - duplicate identifier Foo - confirmed
-        ~~~~~~~~~~~~~~~
+               ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
         public get Goo(v:string):string {return null;} // error - getters must not have a parameter
                    ~~~
diff --git a/tests/baselines/reference/giant.errors.txt b/tests/baselines/reference/giant.errors.txt
index 46e3632a938..5ef1393915d 100644
--- a/tests/baselines/reference/giant.errors.txt
+++ b/tests/baselines/reference/giant.errors.txt
@@ -146,137 +146,137 @@ tests/cases/compiler/giant.ts(672,25): error TS1036: Statements are not allowed
 tests/cases/compiler/giant.ts(676,30): error TS1037: A function implementation cannot be declared in an ambient context.
 tests/cases/compiler/giant.ts(676,33): error TS1036: Statements are not allowed in ambient contexts.
 tests/cases/compiler/giant.ts(23,12): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(24,5): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(24,16): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(24,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(25,12): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(26,5): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(26,16): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(27,13): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(28,5): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(28,17): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(28,17): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(29,13): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(30,5): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(30,17): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(33,12): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(34,5): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(34,16): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(35,12): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(36,5): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(36,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(36,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(76,5): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(87,16): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(88,9): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(88,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(88,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(89,16): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(90,9): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(90,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(91,17): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(92,9): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(92,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(92,21): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(93,17): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(94,9): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(94,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(97,16): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(98,9): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(98,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(99,16): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(100,9): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(100,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(100,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(140,9): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(166,16): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(167,9): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(167,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(167,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(168,16): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(169,9): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(169,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(170,17): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(171,9): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(171,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(171,21): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(172,17): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(173,9): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(173,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(176,16): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(177,9): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(177,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(178,16): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(179,9): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(179,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(179,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(219,9): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(245,16): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(246,9): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(246,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(247,16): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(248,9): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(248,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(249,17): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(250,9): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(250,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(251,17): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(252,9): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(252,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(255,16): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(256,9): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(256,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(257,16): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(258,9): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(258,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(281,12): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(282,5): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(282,16): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(282,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(283,12): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(284,5): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(284,16): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(285,13): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(286,5): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(286,17): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(286,17): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(287,13): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(288,5): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(288,17): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(291,12): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(292,5): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(292,16): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(293,12): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(294,5): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(294,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(294,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(334,5): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(345,16): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(346,9): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(346,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(346,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(347,16): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(348,9): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(348,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(349,17): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(350,9): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(350,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(350,21): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(351,17): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(352,9): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(352,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(355,16): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(356,9): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(356,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(357,16): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(358,9): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(358,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(358,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(398,9): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(424,16): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(425,9): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(425,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(425,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(426,16): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(427,9): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(427,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(428,17): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(429,9): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(429,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(429,21): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(430,17): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(431,9): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(431,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(434,16): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(435,9): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(435,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(436,16): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(437,9): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(437,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(437,20): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/compiler/giant.ts(477,9): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(503,16): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(504,9): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(504,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(505,16): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(506,9): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(506,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(507,17): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(508,9): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(508,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(509,17): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(510,9): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(510,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(513,16): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(514,9): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(514,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(515,16): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(516,9): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(516,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(539,12): error TS2300: Duplicate identifier 'pgF'.
-tests/cases/compiler/giant.ts(540,5): error TS2300: Duplicate identifier 'pgF'.
+tests/cases/compiler/giant.ts(540,16): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(541,12): error TS2300: Duplicate identifier 'psF'.
-tests/cases/compiler/giant.ts(542,5): error TS2300: Duplicate identifier 'psF'.
+tests/cases/compiler/giant.ts(542,16): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(543,13): error TS2300: Duplicate identifier 'rgF'.
-tests/cases/compiler/giant.ts(544,5): error TS2300: Duplicate identifier 'rgF'.
+tests/cases/compiler/giant.ts(544,17): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(545,13): error TS2300: Duplicate identifier 'rsF'.
-tests/cases/compiler/giant.ts(546,5): error TS2300: Duplicate identifier 'rsF'.
+tests/cases/compiler/giant.ts(546,17): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(549,12): error TS2300: Duplicate identifier 'tsF'.
-tests/cases/compiler/giant.ts(550,5): error TS2300: Duplicate identifier 'tsF'.
+tests/cases/compiler/giant.ts(550,16): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(551,12): error TS2300: Duplicate identifier 'tgF'.
-tests/cases/compiler/giant.ts(552,5): error TS2300: Duplicate identifier 'tgF'.
+tests/cases/compiler/giant.ts(552,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(602,9): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all be optional or required.
 
@@ -308,7 +308,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
         public get pgF()
-        ~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
                    ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -318,7 +318,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
         public set psF(param:any)
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
         private rgF() { }
         ~~~~~~~
@@ -326,7 +326,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                 ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
         private get rgF()
-        ~~~~~~~~~~~~~~~~~
+                    ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
                     ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -336,7 +336,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                 ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
         private set rsF(param:any)
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
         static tV;
         ~~~~~~
@@ -346,7 +346,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
         static set tsF(param:any)
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
         static tgF() { }
         ~~~~~~
@@ -354,7 +354,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
         static get tgF()
-        ~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
                    ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -422,7 +422,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public get pgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -432,7 +432,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             public set psF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
             ~~~~~~~
@@ -440,7 +440,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private get rgF()
-            ~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
                         ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -450,7 +450,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             private set rsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             ~~~~~~
@@ -460,7 +460,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static set tsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
             ~~~~~~
@@ -468,7 +468,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
             static get tgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -553,7 +553,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public get pgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -563,7 +563,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             public set psF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
             ~~~~~~~
@@ -571,7 +571,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private get rgF()
-            ~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
                         ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -581,7 +581,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             private set rsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             ~~~~~~
@@ -591,7 +591,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static set tsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
             ~~~~~~
@@ -599,7 +599,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
             static get tgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -696,7 +696,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             public get pgF()
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public psF(param:any) { }
                                   ~
@@ -706,7 +706,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             public set psF(param:any)
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
                           ~
@@ -716,7 +716,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             private get rgF()
                         ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private rsF(param:any) { }
                                    ~
@@ -726,7 +726,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             private set rsF(param:any)
                         ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             static tF() { }
@@ -740,7 +740,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             static set tsF(param:any)
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
                          ~
@@ -750,7 +750,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             static get tgF()
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
         }
         export declare module eaM {
@@ -786,7 +786,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
         public get pgF()
-        ~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
                    ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -796,7 +796,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
         public set psF(param:any)
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
         private rgF() { }
         ~~~~~~~
@@ -804,7 +804,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                 ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
         private get rgF()
-        ~~~~~~~~~~~~~~~~~
+                    ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
                     ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -814,7 +814,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                 ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
         private set rsF(param:any)
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
         static tV;
         ~~~~~~
@@ -824,7 +824,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
         static set tsF(param:any)
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
         static tgF() { }
         ~~~~~~
@@ -832,7 +832,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
         static get tgF()
-        ~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
                    ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -900,7 +900,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public get pgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -910,7 +910,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             public set psF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
             ~~~~~~~
@@ -918,7 +918,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private get rgF()
-            ~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
                         ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -928,7 +928,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             private set rsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             ~~~~~~
@@ -938,7 +938,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static set tsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
             ~~~~~~
@@ -946,7 +946,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
             static get tgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -1031,7 +1031,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public get pgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -1041,7 +1041,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             public set psF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
             ~~~~~~~
@@ -1049,7 +1049,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private get rgF()
-            ~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
                         ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -1059,7 +1059,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                     ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             private set rsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             ~~~~~~
@@ -1069,7 +1069,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static set tsF(param:any)
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
             ~~~~~~
@@ -1077,7 +1077,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
                    ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
             static get tgF()
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
                        ~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
@@ -1174,7 +1174,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             public get pgF()
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public psF(param:any) { }
                                   ~
@@ -1184,7 +1184,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             public set psF(param:any)
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
                           ~
@@ -1194,7 +1194,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             private get rgF()
                         ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private rsF(param:any) { }
                                    ~
@@ -1204,7 +1204,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             private set rsF(param:any)
                         ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             static tF() { }
@@ -1218,7 +1218,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             static set tsF(param:any)
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
                          ~
@@ -1228,7 +1228,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
             static get tgF()
                        ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~~~~~~~~~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
         }
         export declare module eaM {
@@ -1276,7 +1276,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
         public get pgF()
                    ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
         public psF(param:any) { }
                               ~
@@ -1286,7 +1286,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
         public set psF(param:any)
                    ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
         private rgF() { }
                       ~
@@ -1296,7 +1296,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
         private get rgF()
                     ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~
+                    ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
         private rsF(param:any) { }
                                ~
@@ -1306,7 +1306,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
         private set rsF(param:any)
                     ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
         static tV;
         static tF() { }
@@ -1320,7 +1320,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
         static set tsF(param:any)
                    ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
         static tgF() { }
                      ~
@@ -1330,7 +1330,7 @@ tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all
         static get tgF()
                    ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~
+                   ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
     }
     export declare module eaM {
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt b/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt
index 3ddd9f7c409..39567a11753 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/importAndVariableDeclarationConflict3.ts(5,8): error TS2300: Duplicate identifier 'x'.
-tests/cases/compiler/importAndVariableDeclarationConflict3.ts(6,1): error TS2300: Duplicate identifier 'x'.
+tests/cases/compiler/importAndVariableDeclarationConflict3.ts(6,8): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/compiler/importAndVariableDeclarationConflict3.ts (2 errors) ====
@@ -11,6 +11,6 @@ tests/cases/compiler/importAndVariableDeclarationConflict3.ts(6,1): error TS2300
            ~
 !!! error TS2300: Duplicate identifier 'x'.
     import x = m.m;
-    ~~~~~~~~~~~~~~~
+           ~
 !!! error TS2300: Duplicate identifier 'x'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceDeclaration1.errors.txt b/tests/baselines/reference/interfaceDeclaration1.errors.txt
index 43cafecf578..3d7fcb86784 100644
--- a/tests/baselines/reference/interfaceDeclaration1.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration1.errors.txt
@@ -16,7 +16,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i
         ~~~~
 !!! error TS2300: Duplicate identifier 'item'.
         item:number;
-        ~~~~~~~~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier 'item'.
     }
     
@@ -25,7 +25,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i
         ~~~~
 !!! error TS2300: Duplicate identifier 'item'.
         item:number;
-        ~~~~~~~~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier 'item'.
     }
     
diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
index a6bccf35f39..39e5cfaa834 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
@@ -21,7 +21,7 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
         thunk: (num: number) => {}
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
     });
     
@@ -33,7 +33,7 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
 !!! error TS2300: Duplicate identifier 'thunk'.
         thunk: (str: string) => {}
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
     });
     ~
diff --git a/tests/baselines/reference/memberOverride.errors.txt b/tests/baselines/reference/memberOverride.errors.txt
index 896275c70b1..c63803f5aa1 100644
--- a/tests/baselines/reference/memberOverride.errors.txt
+++ b/tests/baselines/reference/memberOverride.errors.txt
@@ -11,7 +11,7 @@ tests/cases/compiler/memberOverride.ts(8,5): error TS2323: Type 'string' is not
         ~
 !!! error TS2300: Duplicate identifier 'a'.
         a: 5
-        ~~~~
+        ~
 !!! error TS2300: Duplicate identifier 'a'.
     }
     
diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt
index 5ea03a4970e..0b5984dcc6d 100644
--- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt
@@ -15,7 +15,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConfli
     
     interface A {
         x: number;
-        ~~~~~~~~~~
+        ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -28,7 +28,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConfli
     
         interface A<T> {
             x: number;  // error
-            ~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
         }
     }
@@ -56,7 +56,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConfli
     module M3 {
         export interface A<T> {
             x: number;  // error
-            ~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.errors.txt b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.errors.txt
index cdf41dfc91d..d0a50f4ae69 100644
--- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.errors.txt
@@ -15,7 +15,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConfli
     
     interface A {
         x: string; // error
-        ~~~~~~~~~~
+        ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -28,7 +28,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConfli
     
         interface A<T> {
             x: T;  // error
-            ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
         }
     }
@@ -56,7 +56,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConfli
     module M3 {
         export interface A<T> {
             x: T;  // error
-            ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/nameCollisions.errors.txt b/tests/baselines/reference/nameCollisions.errors.txt
index ac4bd770c1d..baa7c6cbfd5 100644
--- a/tests/baselines/reference/nameCollisions.errors.txt
+++ b/tests/baselines/reference/nameCollisions.errors.txt
@@ -4,11 +4,11 @@ tests/cases/compiler/nameCollisions.ts(10,12): error TS2300: Duplicate identifie
 tests/cases/compiler/nameCollisions.ts(13,9): error TS2300: Duplicate identifier 'z'.
 tests/cases/compiler/nameCollisions.ts(15,12): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
 tests/cases/compiler/nameCollisions.ts(24,9): error TS2300: Duplicate identifier 'f'.
-tests/cases/compiler/nameCollisions.ts(25,5): error TS2300: Duplicate identifier 'f'.
+tests/cases/compiler/nameCollisions.ts(25,14): error TS2300: Duplicate identifier 'f'.
 tests/cases/compiler/nameCollisions.ts(27,14): error TS2300: Duplicate identifier 'f2'.
 tests/cases/compiler/nameCollisions.ts(28,9): error TS2300: Duplicate identifier 'f2'.
 tests/cases/compiler/nameCollisions.ts(33,11): error TS2300: Duplicate identifier 'C'.
-tests/cases/compiler/nameCollisions.ts(34,5): error TS2300: Duplicate identifier 'C'.
+tests/cases/compiler/nameCollisions.ts(34,14): error TS2300: Duplicate identifier 'C'.
 tests/cases/compiler/nameCollisions.ts(36,14): error TS2300: Duplicate identifier 'C2'.
 tests/cases/compiler/nameCollisions.ts(37,11): error TS2300: Duplicate identifier 'C2'.
 tests/cases/compiler/nameCollisions.ts(42,11): error TS2300: Duplicate identifier 'cli'.
@@ -55,7 +55,7 @@ tests/cases/compiler/nameCollisions.ts(46,11): error TS2300: Duplicate identifie
             ~
 !!! error TS2300: Duplicate identifier 'f'.
         function f() { } //error
-        ~~~~~~~~~~~~~~~~
+                 ~
 !!! error TS2300: Duplicate identifier 'f'.
     
         function f2() { }
@@ -72,7 +72,7 @@ tests/cases/compiler/nameCollisions.ts(46,11): error TS2300: Duplicate identifie
               ~
 !!! error TS2300: Duplicate identifier 'C'.
         function C() { } // error
-        ~~~~~~~~~~~~~~~~
+                 ~
 !!! error TS2300: Duplicate identifier 'C'.
     
         function C2() { }
diff --git a/tests/baselines/reference/numericClassMembers1.errors.txt b/tests/baselines/reference/numericClassMembers1.errors.txt
index 7d17e7cdcbe..eb99f26bb4c 100644
--- a/tests/baselines/reference/numericClassMembers1.errors.txt
+++ b/tests/baselines/reference/numericClassMembers1.errors.txt
@@ -10,7 +10,7 @@ tests/cases/compiler/numericClassMembers1.ts(8,2): error TS2300: Duplicate ident
       ~
 !!! error TS2300: Duplicate identifier '0'.
       0.0 = 2;
-      ~~~~~~~~
+      ~~~
 !!! error TS2300: Duplicate identifier '0.0'.
     }
      
@@ -19,7 +19,7 @@ tests/cases/compiler/numericClassMembers1.ts(8,2): error TS2300: Duplicate ident
       ~~~
 !!! error TS2300: Duplicate identifier '0.0'.
      '0' = 2;
-     ~~~~~~~~
+     ~~~
 !!! error TS2300: Duplicate identifier ''0''.
     }
     
diff --git a/tests/baselines/reference/numericNamedPropertyDuplicates.errors.txt b/tests/baselines/reference/numericNamedPropertyDuplicates.errors.txt
index 663cf45fcff..c5890d7c98c 100644
--- a/tests/baselines/reference/numericNamedPropertyDuplicates.errors.txt
+++ b/tests/baselines/reference/numericNamedPropertyDuplicates.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedP
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(2,5): error TS2300: Duplicate identifier '1'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(3,5): error TS2300: Duplicate identifier '1.0'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(4,12): error TS2300: Duplicate identifier '2'.
-tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(5,5): error TS2300: Duplicate identifier '2'.
+tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(5,12): error TS2300: Duplicate identifier '2'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(9,5): error TS2300: Duplicate identifier '2'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(10,5): error TS2300: Duplicate identifier '2.'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedPropertyDuplicates.ts(14,5): error TS2300: Duplicate identifier '1'.
@@ -17,13 +17,13 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedP
         ~
 !!! error TS2300: Duplicate identifier '1'.
         1.0: number;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
         static 2: number;
                ~
 !!! error TS2300: Duplicate identifier '2'.
         static 2: number;
-        ~~~~~~~~~~~~~~~~~
+               ~
 !!! error TS2300: Duplicate identifier '2'.
     }
     
@@ -32,7 +32,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedP
         ~
 !!! error TS2300: Duplicate identifier '2'.
         2.: number;
-        ~~~~~~~~~~~
+        ~~
 !!! error TS2300: Duplicate identifier '2.'.
     }
     
@@ -41,7 +41,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedP
         ~
 !!! error TS2300: Duplicate identifier '1'.
         1: number;
-        ~~~~~~~~~~
+        ~
 !!! error TS2300: Duplicate identifier '1'.
     }
     
@@ -52,6 +52,6 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericNamedP
         2: 1
         ~
 !!! error TS1005: ',' expected.
-        ~~~~
+        ~
 !!! error TS2300: Duplicate identifier '2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/numericStringNamedPropertyEquivalence.errors.txt b/tests/baselines/reference/numericStringNamedPropertyEquivalence.errors.txt
index a5353efe9ad..4ebef99bd07 100644
--- a/tests/baselines/reference/numericStringNamedPropertyEquivalence.errors.txt
+++ b/tests/baselines/reference/numericStringNamedPropertyEquivalence.errors.txt
@@ -17,7 +17,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericString
 !!! error TS2300: Duplicate identifier '"1"'.
         "1.0": number; // not a duplicate
         1.0: number;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
     }
     
@@ -27,7 +27,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericString
 !!! error TS2300: Duplicate identifier '"1"'.
         "1.": number; // not a duplicate
         1: number;
-        ~~~~~~~~~~
+        ~
 !!! error TS2300: Duplicate identifier '1'.
     }
     
@@ -36,7 +36,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericString
         ~~~
 !!! error TS2300: Duplicate identifier '"1"'.
         1.0: string;
-        ~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
     }
     
@@ -45,6 +45,6 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/numericString
         ~~~
 !!! error TS2300: Duplicate identifier '"0"'.
         0: ''
-        ~~~~~
+        ~
 !!! error TS2300: Duplicate identifier '0'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralErrors.errors.txt b/tests/baselines/reference/objectLiteralErrors.errors.txt
index a301ae56b5f..1fc92ac5a48 100644
--- a/tests/baselines/reference/objectLiteralErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralErrors.errors.txt
@@ -55,41 +55,41 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(19,22)
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(20,13): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(20,25): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(23,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(23,18): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(23,22): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(24,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(24,19): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(24,23): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(25,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(25,18): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(25,22): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(26,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(26,21): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(26,25): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(27,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(27,19): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(27,23): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(28,12): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(28,18): error TS2300: Duplicate identifier ''a''.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(28,22): error TS2300: Duplicate identifier ''a''.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(29,12): error TS2300: Duplicate identifier ''a''.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(29,20): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(29,24): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(30,12): error TS2300: Duplicate identifier ''a''.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(30,20): error TS2300: Duplicate identifier '"a"'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(30,24): error TS2300: Duplicate identifier '"a"'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(31,12): error TS2300: Duplicate identifier ''a''.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(31,20): error TS2300: Duplicate identifier ''a''.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(31,24): error TS2300: Duplicate identifier ''a''.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(32,13): error TS2300: Duplicate identifier '"a"'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(32,21): error TS2300: Duplicate identifier ''a''.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(32,25): error TS2300: Duplicate identifier ''a''.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(33,13): error TS2300: Duplicate identifier '1.0'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(33,21): error TS2300: Duplicate identifier ''1''.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(33,25): error TS2300: Duplicate identifier ''1''.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(34,13): error TS2300: Duplicate identifier '0'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(34,19): error TS2300: Duplicate identifier '0'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(34,23): error TS2300: Duplicate identifier '0'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(35,13): error TS2300: Duplicate identifier '0'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(35,19): error TS2300: Duplicate identifier '0'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(35,23): error TS2300: Duplicate identifier '0'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(36,13): error TS2300: Duplicate identifier '0'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(36,19): error TS2300: Duplicate identifier '0x0'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(36,23): error TS2300: Duplicate identifier '0x0'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(37,13): error TS2300: Duplicate identifier '0'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(37,19): error TS2300: Duplicate identifier '000'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(37,23): error TS2300: Duplicate identifier '000'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(38,13): error TS2300: Duplicate identifier '"100"'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(38,23): error TS2300: Duplicate identifier '1e2'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(38,27): error TS2300: Duplicate identifier '1e2'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(39,13): error TS2300: Duplicate identifier '0x20'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(39,22): error TS2300: Duplicate identifier '3.2e1'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(39,26): error TS2300: Duplicate identifier '3.2e1'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(40,13): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(40,42): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(40,46): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(43,12): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(43,43): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(44,29): error TS2323: Type 'number' is not assignable to type 'string'.
@@ -103,94 +103,94 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,51)
     var e1 = { a: 0, a: 0 };
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~~~~
+                     ~
 !!! error TS2300: Duplicate identifier 'a'.
     var e2 = { a: '', a: '' };
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                      ~~~~~
+                      ~
 !!! error TS2300: Duplicate identifier 'a'.
     var e3 = { a: 0, a: '' };
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~~~~~
+                     ~
 !!! error TS2300: Duplicate identifier 'a'.
     var e4 = { a: true, a: false };
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                        ~~~~~~~~
+                        ~
 !!! error TS2300: Duplicate identifier 'a'.
     var e5 = { a: {}, a: {} };
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                      ~~~~~
+                      ~
 !!! error TS2300: Duplicate identifier 'a'.
     var e6 = { a: 0, 'a': 0 };
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~~~~~~
+                     ~~~
 !!! error TS2300: Duplicate identifier ''a''.
     var e7 = { 'a': 0, a: 0 };
                ~~~
 !!! error TS2300: Duplicate identifier ''a''.
-                       ~~~~
+                       ~
 !!! error TS2300: Duplicate identifier 'a'.
     var e8 = { 'a': 0, "a": 0 };
                ~~~
 !!! error TS2300: Duplicate identifier ''a''.
-                       ~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier '"a"'.
     var e9 = { 'a': 0, 'a': 0 };
                ~~~
 !!! error TS2300: Duplicate identifier ''a''.
-                       ~~~~~~
+                       ~~~
 !!! error TS2300: Duplicate identifier ''a''.
     var e10 = { "a": 0, 'a': 0 };
                 ~~~
 !!! error TS2300: Duplicate identifier '"a"'.
-                        ~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier ''a''.
     var e11 = { 1.0: 0, '1': 0 };
                 ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
-                        ~~~~~~
+                        ~~~
 !!! error TS2300: Duplicate identifier ''1''.
     var e12 = { 0: 0, 0: 0 };
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~
+                      ~
 !!! error TS2300: Duplicate identifier '0'.
     var e13 = { 0: 0, 0: 0 };
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~
+                      ~
 !!! error TS2300: Duplicate identifier '0'.
     var e14 = { 0: 0, 0x0: 0 };
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~~~
+                      ~~~
 !!! error TS2300: Duplicate identifier '0x0'.
     var e14 = { 0: 0, 000: 0 };
                       ~~~
 !!! error TS1085: Octal literals are not available when targeting ECMAScript 5 and higher.
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~~~
+                      ~~~
 !!! error TS2300: Duplicate identifier '000'.
     var e15 = { "100": 0, 1e2: 0 };
                 ~~~~~
 !!! error TS2300: Duplicate identifier '"100"'.
-                          ~~~~~~
+                          ~~~
 !!! error TS2300: Duplicate identifier '1e2'.
     var e16 = { 0x20: 0, 3.2e1: 0 };
                 ~~~~
 !!! error TS2300: Duplicate identifier '0x20'.
-                         ~~~~~~~~
+                         ~~~~~
 !!! error TS2300: Duplicate identifier '3.2e1'.
     var e17 = { a: 0, b: 1, a: 0 };
                 ~
 !!! error TS2300: Duplicate identifier 'a'.
-                            ~~~~
+                            ~
 !!! error TS2300: Duplicate identifier 'a'.
     
     // Accessor and property with the same name
@@ -199,98 +199,98 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,51)
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~~~~~~~~~~~~~~~~~~~~~
+                         ~
 !!! error TS2300: Duplicate identifier 'a'.
     var f2 = { a: '', get a() { return ''; } };
                           ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                      ~~~~~~~~~~~~~~~~~~~~~~
+                          ~
 !!! error TS2300: Duplicate identifier 'a'.
     var f3 = { a: 0, get a() { return ''; } };
                          ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~~~~~~~~~~~~~~~~~~~~~~
+                         ~
 !!! error TS2300: Duplicate identifier 'a'.
     var f4 = { a: true, get a() { return false; } };
                             ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~
+                            ~
 !!! error TS2300: Duplicate identifier 'a'.
     var f5 = { a: {}, get a() { return {}; } };
                           ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                      ~~~~~~~~~~~~~~~~~~~~~~
+                          ~
 !!! error TS2300: Duplicate identifier 'a'.
     var f6 = { a: 0, get 'a'() { return 0; } };
                          ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~~~~~~~~~~~~~~~~~~~~~~~
+                         ~~~
 !!! error TS2300: Duplicate identifier ''a''.
     var f7 = { 'a': 0, get a() { return 0; } };
                            ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~~~
 !!! error TS2300: Duplicate identifier ''a''.
-                       ~~~~~~~~~~~~~~~~~~~~~
+                           ~
 !!! error TS2300: Duplicate identifier 'a'.
     var f8 = { 'a': 0, get "a"() { return 0; } };
                            ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~~~
 !!! error TS2300: Duplicate identifier ''a''.
-                       ~~~~~~~~~~~~~~~~~~~~~~~
+                           ~~~
 !!! error TS2300: Duplicate identifier '"a"'.
     var f9 = { 'a': 0, get 'a'() { return 0; } };
                            ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                ~~~
 !!! error TS2300: Duplicate identifier ''a''.
-                       ~~~~~~~~~~~~~~~~~~~~~~~
+                           ~~~
 !!! error TS2300: Duplicate identifier ''a''.
     var f10 = { "a": 0, get 'a'() { return 0; } };
                             ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~~~
 !!! error TS2300: Duplicate identifier '"a"'.
-                        ~~~~~~~~~~~~~~~~~~~~~~~
+                            ~~~
 !!! error TS2300: Duplicate identifier ''a''.
     var f11 = { 1.0: 0, get '1'() { return 0; } };
                             ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
-                        ~~~~~~~~~~~~~~~~~~~~~~~
+                            ~~~
 !!! error TS2300: Duplicate identifier ''1''.
     var f12 = { 0: 0, get 0() { return 0; } };
                           ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~~~~~~~~~~~~~~~~~~
+                          ~
 !!! error TS2300: Duplicate identifier '0'.
     var f13 = { 0: 0, get 0() { return 0; } };
                           ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~~~~~~~~~~~~~~~~~~
+                          ~
 !!! error TS2300: Duplicate identifier '0'.
     var f14 = { 0: 0, get 0x0() { return 0; } };
                           ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~~~~~~~~~~~~~~~~~~~~
+                          ~~~
 !!! error TS2300: Duplicate identifier '0x0'.
     var f14 = { 0: 0, get 000() { return 0; } };
                           ~~~
@@ -299,28 +299,28 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,51)
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~
 !!! error TS2300: Duplicate identifier '0'.
-                      ~~~~~~~~~~~~~~~~~~~~~~~
+                          ~~~
 !!! error TS2300: Duplicate identifier '000'.
     var f15 = { "100": 0, get 1e2() { return 0; } };
                               ~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~~~~~
 !!! error TS2300: Duplicate identifier '"100"'.
-                          ~~~~~~~~~~~~~~~~~~~~~~~
+                              ~~~
 !!! error TS2300: Duplicate identifier '1e2'.
     var f16 = { 0x20: 0, get 3.2e1() { return 0; } };
                              ~~~~~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~~~~
 !!! error TS2300: Duplicate identifier '0x20'.
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~
+                             ~~~~~
 !!! error TS2300: Duplicate identifier '3.2e1'.
     var f17 = { a: 0, get b() { return 1; }, get a() { return 0; } };
                                                  ~
 !!! error TS1119: An object literal cannot have property and accessor with the same name.
                 ~
 !!! error TS2300: Duplicate identifier 'a'.
-                                             ~~~~~~~~~~~~~~~~~~~~~
+                                                 ~
 !!! error TS2300: Duplicate identifier 'a'.
     
     // Get and set accessor with mismatched type annotations
diff --git a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.errors.txt b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.errors.txt
index 018dae20a79..c89cd04d1ee 100644
--- a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.errors.txt
+++ b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.errors.txt
@@ -25,13 +25,13 @@ tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts(
         ~
 !!! error TS2300: Duplicate identifier '1'.
         1.0;
-        ~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
         1.;
-        ~~~
+        ~~
 !!! error TS2300: Duplicate identifier '1.'.
         1.00;
-        ~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier '1.00'.
     }
     
@@ -40,13 +40,13 @@ tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts(
         ~
 !!! error TS2300: Duplicate identifier '1'.
         1.0;
-        ~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
         1.;
-        ~~~
+        ~~
 !!! error TS2300: Duplicate identifier '1.'.
         1.00;
-        ~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier '1.00'.
     }
     
@@ -55,13 +55,13 @@ tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts(
         ~
 !!! error TS2300: Duplicate identifier '1'.
         1.0;
-        ~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
         1.;
-        ~~~
+        ~~
 !!! error TS2300: Duplicate identifier '1.'.
         1.00;
-        ~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier '1.00'.
     }
     
@@ -70,13 +70,13 @@ tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts(
         ~
 !!! error TS2300: Duplicate identifier '1'.
         1.0: 1,
-        ~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier '1.0'.
         1.: 1,
-        ~~~~~
+        ~~
 !!! error TS2300: Duplicate identifier '1.'.
         1.00: 1
-        ~~~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier '1.00'.
     }
     
diff --git a/tests/baselines/reference/optionalParamArgsTest.errors.txt b/tests/baselines/reference/optionalParamArgsTest.errors.txt
index 8f02c603eb7..a8ce88e494e 100644
--- a/tests/baselines/reference/optionalParamArgsTest.errors.txt
+++ b/tests/baselines/reference/optionalParamArgsTest.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/optionalParamArgsTest.ts(35,47): error TS1016: A required parameter cannot follow an optional parameter.
-tests/cases/compiler/optionalParamArgsTest.ts(31,5): error TS2393: Duplicate function implementation.
-tests/cases/compiler/optionalParamArgsTest.ts(35,5): error TS2393: Duplicate function implementation.
+tests/cases/compiler/optionalParamArgsTest.ts(31,12): error TS2393: Duplicate function implementation.
+tests/cases/compiler/optionalParamArgsTest.ts(35,12): error TS2393: Duplicate function implementation.
 tests/cases/compiler/optionalParamArgsTest.ts(99,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/compiler/optionalParamArgsTest.ts(100,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/compiler/optionalParamArgsTest.ts(101,1): error TS2346: Supplied parameters do not match any signature of call target.
@@ -55,7 +55,7 @@ tests/cases/compiler/optionalParamArgsTest.ts(118,1): error TS2346: Supplied par
         public C1M4(C1M4A1:number,C1M4A2?:number) { return C1M4A1 + C1M4A2; }
     
         public C1M5(C1M5A1:number,C1M5A2:number=0,C1M5A3?:number) { return C1M5A1 + C1M5A2; }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~
 !!! error TS2393: Duplicate function implementation.
     
         // Negative test
@@ -63,7 +63,7 @@ tests/cases/compiler/optionalParamArgsTest.ts(118,1): error TS2346: Supplied par
         public C1M5(C1M5A1:number,C1M5A2:number=0,C1M5A3:number) { return C1M5A1 + C1M5A2; }
                                                   ~~~~~~
 !!! error TS1016: A required parameter cannot follow an optional parameter.
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~
 !!! error TS2393: Duplicate function implementation.
     }
     
diff --git a/tests/baselines/reference/optionalPropertiesSyntax.errors.txt b/tests/baselines/reference/optionalPropertiesSyntax.errors.txt
index 41197ac64e1..66c1cae2a7e 100644
--- a/tests/baselines/reference/optionalPropertiesSyntax.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesSyntax.errors.txt
@@ -55,7 +55,7 @@ tests/cases/compiler/optionalPropertiesSyntax.ts(34,5): error TS2375: Duplicate
         ~~~~
 !!! error TS2300: Duplicate identifier 'prop'.
         prop?: any;
-        ~~~~~~~~~~~
+        ~~~~
 !!! error TS2300: Duplicate identifier 'prop'.
         prop2?: any;
     }
diff --git a/tests/baselines/reference/overloadsWithinClasses.errors.txt b/tests/baselines/reference/overloadsWithinClasses.errors.txt
index 39e43d26707..02872861a4b 100644
--- a/tests/baselines/reference/overloadsWithinClasses.errors.txt
+++ b/tests/baselines/reference/overloadsWithinClasses.errors.txt
@@ -1,16 +1,16 @@
-tests/cases/compiler/overloadsWithinClasses.ts(3,5): error TS2393: Duplicate function implementation.
-tests/cases/compiler/overloadsWithinClasses.ts(5,5): error TS2393: Duplicate function implementation.
+tests/cases/compiler/overloadsWithinClasses.ts(3,12): error TS2393: Duplicate function implementation.
+tests/cases/compiler/overloadsWithinClasses.ts(5,12): error TS2393: Duplicate function implementation.
 
 
 ==== tests/cases/compiler/overloadsWithinClasses.ts (2 errors) ====
     class foo {
      
         static fnOverload( ) {}
-        ~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~
 !!! error TS2393: Duplicate function implementation.
      
         static fnOverload(foo: string){ } // error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~
 !!! error TS2393: Duplicate function implementation.
      
     }
diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt b/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt
index 78a4706ec68..5885385a20c 100644
--- a/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt
+++ b/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/parameterPropertyInConstructor2.ts(3,5): error TS2394: Overload signature is not compatible with function implementation.
 tests/cases/compiler/parameterPropertyInConstructor2.ts(3,17): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/compiler/parameterPropertyInConstructor2.ts(3,24): error TS2300: Duplicate identifier 'names'.
-tests/cases/compiler/parameterPropertyInConstructor2.ts(4,17): error TS2300: Duplicate identifier 'names'.
+tests/cases/compiler/parameterPropertyInConstructor2.ts(4,24): error TS2300: Duplicate identifier 'names'.
 
 
 ==== tests/cases/compiler/parameterPropertyInConstructor2.ts (4 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/parameterPropertyInConstructor2.ts(4,17): error TS2300: Dup
                            ~~~~~
 !!! error TS2300: Duplicate identifier 'names'.
         constructor(public names: string, public ages: number) {
-                    ~~~~~~~~~~~~~~~~~~~~
+                           ~~~~~
 !!! error TS2300: Duplicate identifier 'names'.
         }
       }
diff --git a/tests/baselines/reference/parserErrorRecovery_ModuleElement2.errors.txt b/tests/baselines/reference/parserErrorRecovery_ModuleElement2.errors.txt
index ab0327a716f..eb4d6dc3471 100644
--- a/tests/baselines/reference/parserErrorRecovery_ModuleElement2.errors.txt
+++ b/tests/baselines/reference/parserErrorRecovery_ModuleElement2.errors.txt
@@ -1,21 +1,19 @@
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts(7,1): error TS1128: Declaration or statement expected.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts(8,1): error TS1128: Declaration or statement expected.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts(1,1): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts(4,1): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts(1,10): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts(4,10): error TS2393: Duplicate function implementation.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement2.ts (4 errors) ====
     function foo() {
-    ~~~~~~~~~~~~~~~~
-    }
-    ~
+             ~~~
 !!! error TS2393: Duplicate function implementation.
+    }
     
     function foo() {
-    ~~~~~~~~~~~~~~~~
-    }
-    ~
+             ~~~
 !!! error TS2393: Duplicate function implementation.
+    }
     
     )
     ~
diff --git a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.errors.txt b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.errors.txt
index 69db4ac7b57..e0d49bb8470 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.errors.txt
+++ b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.errors.txt
@@ -1,40 +1,40 @@
 tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(2,3): error TS2393: Duplicate function implementation.
 tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(3,3): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(5,3): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(6,3): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(8,3): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(9,3): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(11,3): error TS2393: Duplicate function implementation.
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(12,3): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(5,10): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(6,10): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(8,17): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(9,17): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(11,10): error TS2393: Duplicate function implementation.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts(12,10): error TS2393: Duplicate function implementation.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1.ts (8 errors) ====
     class C {
       public() {}
-      ~~~~~~~~~~~
+      ~~~~~~
 !!! error TS2393: Duplicate function implementation.
       static() {}
-      ~~~~~~~~~~~
+      ~~~~~~
 !!! error TS2393: Duplicate function implementation.
     
       public public() {}
-      ~~~~~~~~~~~~~~~~~~
+             ~~~~~~
 !!! error TS2393: Duplicate function implementation.
       public static() {}
-      ~~~~~~~~~~~~~~~~~~
+             ~~~~~~
 !!! error TS2393: Duplicate function implementation.
     
       public static public() {}
-      ~~~~~~~~~~~~~~~~~~~~~~~~~
+                    ~~~~~~
 !!! error TS2393: Duplicate function implementation.
       public static static() {}
-      ~~~~~~~~~~~~~~~~~~~~~~~~~
+                    ~~~~~~
 !!! error TS2393: Duplicate function implementation.
       
       static public() {}
-      ~~~~~~~~~~~~~~~~~~
+             ~~~~~~
 !!! error TS2393: Duplicate function implementation.
       static static() {}
-      ~~~~~~~~~~~~~~~~~~
+             ~~~~~~
 !!! error TS2393: Duplicate function implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAndAccessorWithSameName.errors.txt b/tests/baselines/reference/propertyAndAccessorWithSameName.errors.txt
index a08a924ff75..9ef943cc07a 100644
--- a/tests/baselines/reference/propertyAndAccessorWithSameName.errors.txt
+++ b/tests/baselines/reference/propertyAndAccessorWithSameName.errors.txt
@@ -3,12 +3,12 @@ tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWi
 tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(15,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(18,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(2,5): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(3,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(3,9): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(9,5): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(10,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(10,9): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(14,13): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(15,5): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(18,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(15,9): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts(18,9): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts (11 errors) ====
@@ -19,12 +19,10 @@ tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWi
         get x() { // error
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~
-            return 1;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
+            return 1;
+        }
     }
     
     class D {
@@ -34,7 +32,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWi
         set x(v) { } // error
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -45,15 +43,13 @@ tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWi
         get x() { // error
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~
-            return 1;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
+            return 1;
+        }
         set x(v) { }
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAndFunctionWithSameName.errors.txt b/tests/baselines/reference/propertyAndFunctionWithSameName.errors.txt
index 58b51c9c39e..84428a2dfb1 100644
--- a/tests/baselines/reference/propertyAndFunctionWithSameName.errors.txt
+++ b/tests/baselines/reference/propertyAndFunctionWithSameName.errors.txt
@@ -10,12 +10,10 @@ tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndFunctionWi
         ~
 !!! error TS2300: Duplicate identifier 'x'.
         x() { // error
-        ~~~~~~~~~~~~~~
-            return 1;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+        ~
 !!! error TS2300: Duplicate identifier 'x'.
+            return 1;
+        }
     }
     
     class D {
@@ -23,6 +21,6 @@ tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndFunctionWi
         ~
 !!! error TS2300: Duplicate identifier 'x'.
         x(v) { } // error
-        ~~~~~~~~
+        ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyNamedPrototype.errors.txt b/tests/baselines/reference/propertyNamedPrototype.errors.txt
index 38f8279daed..6ce4054fb43 100644
--- a/tests/baselines/reference/propertyNamedPrototype.errors.txt
+++ b/tests/baselines/reference/propertyNamedPrototype.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/classes/propertyMemberDeclarations/propertyNamedPrototype.ts(3,5): error TS2300: Duplicate identifier 'prototype'.
+tests/cases/conformance/classes/propertyMemberDeclarations/propertyNamedPrototype.ts(3,12): error TS2300: Duplicate identifier 'prototype'.
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/propertyNamedPrototype.ts (1 errors) ====
     class C {
         prototype: number; // ok
         static prototype: C; // error
-        ~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'prototype'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/propertySignatures.errors.txt b/tests/baselines/reference/propertySignatures.errors.txt
index c6bc759dce8..fd415334e74 100644
--- a/tests/baselines/reference/propertySignatures.errors.txt
+++ b/tests/baselines/reference/propertySignatures.errors.txt
@@ -8,7 +8,7 @@ tests/cases/compiler/propertySignatures.ts(14,12): error TS2304: Cannot find nam
     var foo1: { a:string; a: string; };
                 ~
 !!! error TS2300: Duplicate identifier 'a'.
-                          ~~~~~~~~~~
+                          ~
 !!! error TS2300: Duplicate identifier 'a'.
     
     // Should be OK
diff --git a/tests/baselines/reference/reassignStaticProp.errors.txt b/tests/baselines/reference/reassignStaticProp.errors.txt
index e1d845c20e4..bbcfe826787 100644
--- a/tests/baselines/reference/reassignStaticProp.errors.txt
+++ b/tests/baselines/reference/reassignStaticProp.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/reassignStaticProp.ts(3,12): error TS2300: Duplicate identifier 'bar'.
-tests/cases/compiler/reassignStaticProp.ts(5,5): error TS2300: Duplicate identifier 'bar'.
+tests/cases/compiler/reassignStaticProp.ts(5,12): error TS2300: Duplicate identifier 'bar'.
 
 
 ==== tests/cases/compiler/reassignStaticProp.ts (2 errors) ====
@@ -10,7 +10,7 @@ tests/cases/compiler/reassignStaticProp.ts(5,5): error TS2300: Duplicate identif
 !!! error TS2300: Duplicate identifier 'bar'.
      
         static bar:string; // errror - duplicate id
-        ~~~~~~~~~~~~~~~~~~
+               ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
      
     }
diff --git a/tests/baselines/reference/staticPrototypeProperty.errors.txt b/tests/baselines/reference/staticPrototypeProperty.errors.txt
index 32d4438a2cc..19b3f3ffb20 100644
--- a/tests/baselines/reference/staticPrototypeProperty.errors.txt
+++ b/tests/baselines/reference/staticPrototypeProperty.errors.txt
@@ -1,16 +1,16 @@
-tests/cases/compiler/staticPrototypeProperty.ts(2,4): error TS2300: Duplicate identifier 'prototype'.
-tests/cases/compiler/staticPrototypeProperty.ts(6,4): error TS2300: Duplicate identifier 'prototype'.
+tests/cases/compiler/staticPrototypeProperty.ts(2,11): error TS2300: Duplicate identifier 'prototype'.
+tests/cases/compiler/staticPrototypeProperty.ts(6,11): error TS2300: Duplicate identifier 'prototype'.
 
 
 ==== tests/cases/compiler/staticPrototypeProperty.ts (2 errors) ====
     class C {
        static prototype() { }
-       ~~~~~~~~~~~~~~~~~~~~~~
+              ~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'prototype'.
     }
      
     class C2 {
        static prototype;
-       ~~~~~~~~~~~~~~~~~
+              ~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'prototype'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt
index 80857aa1804..cbc517e0520 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt
@@ -65,7 +65,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType
         ~~~~~~~~~~~~~~~~
 !!! error TS2381: A signature with an implementation cannot use a string literal type.
         foo(x: 'a') { },
-        ~~~~~~~~~~~~~~~
+        ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/stringNamedPropertyDuplicates.errors.txt b/tests/baselines/reference/stringNamedPropertyDuplicates.errors.txt
index 9c929aa47ce..e15cb03e062 100644
--- a/tests/baselines/reference/stringNamedPropertyDuplicates.errors.txt
+++ b/tests/baselines/reference/stringNamedPropertyDuplicates.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPr
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(2,5): error TS2300: Duplicate identifier '"a b"'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(3,5): error TS2300: Duplicate identifier '"a b"'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(4,12): error TS2300: Duplicate identifier '"c d"'.
-tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(5,5): error TS2300: Duplicate identifier '"c d"'.
+tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(5,12): error TS2300: Duplicate identifier '"c d"'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(9,5): error TS2300: Duplicate identifier '"a b"'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(10,5): error TS2300: Duplicate identifier '"a b"'.
 tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPropertyDuplicates.ts(14,5): error TS2300: Duplicate identifier '"a b"'.
@@ -17,13 +17,13 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPr
         ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
         "a b": number;
-        ~~~~~~~~~~~~~~
+        ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
         static "c d": number;
                ~~~~~
 !!! error TS2300: Duplicate identifier '"c d"'.
         static "c d": number;
-        ~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~
 !!! error TS2300: Duplicate identifier '"c d"'.
     }
     
@@ -32,7 +32,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPr
         ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
         "a b": number;
-        ~~~~~~~~~~~~~~
+        ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
     }
     
@@ -41,7 +41,7 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPr
         ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
         "a b": number;
-        ~~~~~~~~~~~~~~
+        ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
     }
     
@@ -52,6 +52,6 @@ tests/cases/conformance/types/objectTypeLiteral/propertySignatures/stringNamedPr
         "a b": 1
         ~~~~~
 !!! error TS1005: ',' expected.
-        ~~~~~~~~
+        ~~~~~
 !!! error TS2300: Duplicate identifier '"a b"'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/targetTypeCastTest.errors.txt b/tests/baselines/reference/targetTypeCastTest.errors.txt
index c00ddb36728..c44de5535d0 100644
--- a/tests/baselines/reference/targetTypeCastTest.errors.txt
+++ b/tests/baselines/reference/targetTypeCastTest.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/targetTypeCastTest.ts(1,13): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/targetTypeCastTest.ts(3,1): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/targetTypeCastTest.ts(3,10): error TS2300: Duplicate identifier 'Point'.
 
 
 ==== tests/cases/compiler/targetTypeCastTest.ts (2 errors) ====
@@ -8,14 +8,11 @@ tests/cases/compiler/targetTypeCastTest.ts(3,1): error TS2300: Duplicate identif
 !!! error TS2300: Duplicate identifier 'Point'.
     
     function Point(x, y) {
-    ~~~~~~~~~~~~~~~~~~~~~~
-        this.x = x;
-    ~~~~~~~~~~~~~~~
-        this.y = y;   
-    ~~~~~~~~~~~~~~~~~~
-    }
-    ~
+             ~~~~~
 !!! error TS2300: Duplicate identifier 'Point'.
+        this.x = x;
+        this.y = y;   
+    }
     
     interface Adder {
         (x: number, y: number): number;   
diff --git a/tests/baselines/reference/targetTypeTest1.errors.txt b/tests/baselines/reference/targetTypeTest1.errors.txt
index 1b515bee0fa..a0b05690a3b 100644
--- a/tests/baselines/reference/targetTypeTest1.errors.txt
+++ b/tests/baselines/reference/targetTypeTest1.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/targetTypeTest1.ts(1,15): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/targetTypeTest1.ts(14,1): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/targetTypeTest1.ts(14,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/targetTypeTest1.ts(19,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/compiler/targetTypeTest1.ts(53,15): error TS2300: Duplicate identifier 'C'.
-tests/cases/compiler/targetTypeTest1.ts(60,1): error TS2300: Duplicate identifier 'C'.
+tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifier 'C'.
 
 
 ==== tests/cases/compiler/targetTypeTest1.ts (5 errors) ====
@@ -22,14 +22,11 @@ tests/cases/compiler/targetTypeTest1.ts(60,1): error TS2300: Duplicate identifie
     // Because Point is a constructor function, this is inferred
     // to be Point and return type is inferred to be void
     function Point(x, y) {
-    ~~~~~~~~~~~~~~~~~~~~~~
-        this.x = x;
-    ~~~~~~~~~~~~~~~
-        this.y = y;
-    ~~~~~~~~~~~~~~~
-    }
-    ~
+             ~~~~~
 !!! error TS2300: Duplicate identifier 'Point'.
+        this.x = x;
+        this.y = y;
+    }
     
     declare function EF1(a:number, b:number):number;
                      ~~~
@@ -77,14 +74,11 @@ tests/cases/compiler/targetTypeTest1.ts(60,1): error TS2300: Duplicate identifie
     } 
     
     function C(a,b) {
-    ~~~~~~~~~~~~~~~~~
-    	this.a=a;
-    ~~~~~~~~~~
-    	this.b=b;
-    ~~~~~~~~~~
-    }
-    ~
+             ~
 !!! error TS2300: Duplicate identifier 'C'.
+    	this.a=a;
+    	this.b=b;
+    }
     
     C.prototype = 
     	{	a:0,
diff --git a/tests/baselines/reference/twoAccessorsWithSameName.errors.txt b/tests/baselines/reference/twoAccessorsWithSameName.errors.txt
index fc7b86873f1..81da707c566 100644
--- a/tests/baselines/reference/twoAccessorsWithSameName.errors.txt
+++ b/tests/baselines/reference/twoAccessorsWithSameName.errors.txt
@@ -10,11 +10,11 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(30,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(33,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(2,9): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(3,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(3,9): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(7,9): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(8,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(8,9): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(19,9): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(24,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts(24,9): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts (17 errors) ====
@@ -27,7 +27,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
         get x() { return 1; } // error
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -40,7 +40,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
         set x(v) {  } // error
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -70,12 +70,10 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             ~
 !!! error TS1118: An object literal cannot have multiple get/set accessors with the same name.
-        ~~~~~~~~~
-            return 1;
-    ~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2300: Duplicate identifier 'x'.
+            return 1;
+        }
     }
     
     var y = {
diff --git a/tests/baselines/reference/twoAccessorsWithSameName2.errors.txt b/tests/baselines/reference/twoAccessorsWithSameName2.errors.txt
index d431ed5a828..836a06a8192 100644
--- a/tests/baselines/reference/twoAccessorsWithSameName2.errors.txt
+++ b/tests/baselines/reference/twoAccessorsWithSameName2.errors.txt
@@ -5,9 +5,9 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(12,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(2,16): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(3,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(3,16): error TS2300: Duplicate identifier 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(7,16): error TS2300: Duplicate identifier 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(8,5): error TS2300: Duplicate identifier 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts(8,16): error TS2300: Duplicate identifier 'x'.
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts (10 errors) ====
@@ -20,7 +20,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
         static get x() { return 1; } // error
                    ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
@@ -33,7 +33,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameN
         static set x(v) {  } // error
                    ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-        ~~~~~~~~~~~~~~~~~~~~
+                   ~
 !!! error TS2300: Duplicate identifier 'x'.
     }
     
diff --git a/tests/baselines/reference/varAndFunctionShareName.errors.txt b/tests/baselines/reference/varAndFunctionShareName.errors.txt
index f849bfdfb54..dc4dd4e1b3b 100644
--- a/tests/baselines/reference/varAndFunctionShareName.errors.txt
+++ b/tests/baselines/reference/varAndFunctionShareName.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/varAndFunctionShareName.ts(1,5): error TS2300: Duplicate identifier 'myFn'.
-tests/cases/compiler/varAndFunctionShareName.ts(2,1): error TS2300: Duplicate identifier 'myFn'.
+tests/cases/compiler/varAndFunctionShareName.ts(2,10): error TS2300: Duplicate identifier 'myFn'.
 
 
 ==== tests/cases/compiler/varAndFunctionShareName.ts (2 errors) ====
@@ -7,5 +7,5 @@ tests/cases/compiler/varAndFunctionShareName.ts(2,1): error TS2300: Duplicate id
         ~~~~
 !!! error TS2300: Duplicate identifier 'myFn'.
     function myFn(): any { }
-    ~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~
 !!! error TS2300: Duplicate identifier 'myFn'.
\ No newline at end of file
diff --git a/tests/cases/compiler/callOverloads2.ts b/tests/cases/compiler/callOverloads2.ts
index 3379838dbcf..e18815fd46b 100644
--- a/tests/cases/compiler/callOverloads2.ts
+++ b/tests/cases/compiler/callOverloads2.ts
@@ -10,7 +10,7 @@ class Foo { // error
 
 function Foo(); // error
 
-function F1(s:string) {return s;} // error 
+function F1(s:string) {return s;} // error
 function F1(a:any) { return a;} // error
 
 function Goo(s:string); // error - no implementation
diff --git a/tests/cases/compiler/callOverloads4.ts b/tests/cases/compiler/callOverloads4.ts
index 3957c822cc9..7240e73d0ac 100644
--- a/tests/cases/compiler/callOverloads4.ts
+++ b/tests/cases/compiler/callOverloads4.ts
@@ -1,7 +1,7 @@
 
 function Foo():Foo; // error
 function Foo(s:string):Foo; // error
-class Foo { // error 
+class Foo { // error
     bar1() { /*WScript.Echo("bar1");*/ }
     constructor(s: string);
     constructor(x: any) {
diff --git a/tests/cases/fourslash/addFunctionInDuplicatedConstructorClassBody.ts b/tests/cases/fourslash/addFunctionInDuplicatedConstructorClassBody.ts
index 3315a226528..adbdd4820a0 100644
--- a/tests/cases/fourslash/addFunctionInDuplicatedConstructorClassBody.ts
+++ b/tests/cases/fourslash/addFunctionInDuplicatedConstructorClassBody.ts
@@ -9,4 +9,4 @@
 goTo.marker();
 var func = 'fn() { }';
 edit.insert(func);
-verify.numberOfErrorsInCurrentFile(1);
+verify.numberOfErrorsInCurrentFile(2);
diff --git a/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts b/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts
index 2be62b045c2..7380936d6b2 100644
--- a/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts
+++ b/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts
@@ -14,4 +14,4 @@
 
 goTo.marker();
 verify.quickInfoExists();
-verify.numberOfErrorsInCurrentFile(2);
\ No newline at end of file
+verify.numberOfErrorsInCurrentFile(4);
\ No newline at end of file
diff --git a/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts b/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts
index a5fd6623610..8abdac6d206 100644
--- a/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts
+++ b/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts
@@ -6,9 +6,9 @@
 goTo.marker();
 
 // One error: duplicate identifier 'foo'
-verify.numberOfErrorsInCurrentFile(1);
+verify.numberOfErrorsInCurrentFile(2);
 
 // Shouldn't change the number of errors
 edit.insert('return null;');
-verify.numberOfErrorsInCurrentFile(1);
+verify.numberOfErrorsInCurrentFile(2);