diff --git a/tests/baselines/reference/arrayAugment.symbols b/tests/baselines/reference/arrayAugment.symbols
index f8a614e76a6..8310729032f 100644
--- a/tests/baselines/reference/arrayAugment.symbols
+++ b/tests/baselines/reference/arrayAugment.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/arrayAugment.ts ===
 interface Array<T> {
->Array : Symbol(Array, Decl(arrayAugment.ts, 0, 0), Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
->T : Symbol(T, Decl(arrayAugment.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(arrayAugment.ts, 0, 0))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(arrayAugment.ts, 0, 16))
 
     split: (parts: number) => T[][];
 >split : Symbol(split, Decl(arrayAugment.ts, 0, 20))
 >parts : Symbol(parts, Decl(arrayAugment.ts, 1, 12))
->T : Symbol(T, Decl(arrayAugment.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(arrayAugment.ts, 0, 16))
 }
 
 var x = [''];
diff --git a/tests/baselines/reference/augmentArray.symbols b/tests/baselines/reference/augmentArray.symbols
index 737d698e046..8c52363d601 100644
--- a/tests/baselines/reference/augmentArray.symbols
+++ b/tests/baselines/reference/augmentArray.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/augmentArray.ts ===
 interface Array<T> {
->Array : Symbol(Array, Decl(augmentArray.ts, 0, 0), Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
->T : Symbol(T, Decl(augmentArray.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(augmentArray.ts, 0, 0))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(augmentArray.ts, 0, 16))
 
     (): any[];
 }
diff --git a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
index e8266240f07..81c8b13d207 100644
--- a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
+++ b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
@@ -8,7 +8,7 @@ interface Bar { b }
 >b : Symbol(b, Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 15))
 
 interface Object {
->Object : Symbol(Object, Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 19), Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
+>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11), Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 19))
 
     [n: number]: Foo;
 >n : Symbol(n, Decl(augmentedTypeBracketAccessIndexSignature.ts, 4, 5))
@@ -16,7 +16,7 @@ interface Object {
 }
 
 interface Function {
->Function : Symbol(Function, Decl(augmentedTypeBracketAccessIndexSignature.ts, 5, 1), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
+>Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(augmentedTypeBracketAccessIndexSignature.ts, 5, 1))
 
     [n: number]: Bar;
 >n : Symbol(n, Decl(augmentedTypeBracketAccessIndexSignature.ts, 8, 5))
diff --git a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols
index 901081f3e24..cc9c2ba62ef 100644
--- a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols
+++ b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/augmentedTypeBracketNamedPropertyAccess.ts ===
 interface Object {
->Object : Symbol(Object, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 0), Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
+>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11), Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 0))
 
     data: number;
 >data : Symbol(data, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 18))
 }
 interface Function {
->Function : Symbol(Function, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 2, 1), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
+>Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(augmentedTypeBracketNamedPropertyAccess.ts, 2, 1))
 
     functionData: string;
 >functionData : Symbol(functionData, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 3, 20))
diff --git a/tests/baselines/reference/duplicateNumericIndexers.errors.txt b/tests/baselines/reference/duplicateNumericIndexers.errors.txt
index 0e9b013f6ff..c4c7883021a 100644
--- a/tests/baselines/reference/duplicateNumericIndexers.errors.txt
+++ b/tests/baselines/reference/duplicateNumericIndexers.errors.txt
@@ -1,14 +1,14 @@
-lib.d.ts(431,5): error TS2375: Duplicate number index signature.
-lib.d.ts(1158,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(5,5): error TS2375: Duplicate number index signature.
+tests/cases/conformance/types/members/duplicateNumericIndexers.ts(9,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(10,5): error TS2375: Duplicate number index signature.
+tests/cases/conformance/types/members/duplicateNumericIndexers.ts(14,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(15,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(20,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(25,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/members/duplicateNumericIndexers.ts(30,5): error TS2375: Duplicate number index signature.
 
 
-==== tests/cases/conformance/types/members/duplicateNumericIndexers.ts (6 errors) ====
+==== tests/cases/conformance/types/members/duplicateNumericIndexers.ts (8 errors) ====
     // it is an error to have duplicate index signatures of the same kind in a type
     
     interface Number {
@@ -20,6 +20,8 @@ tests/cases/conformance/types/members/duplicateNumericIndexers.ts(30,5): error T
     
     interface String {
         [x: number]: string;
+        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2375: Duplicate number index signature.
         [x: number]: string;
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2375: Duplicate number index signature.
@@ -27,6 +29,8 @@ tests/cases/conformance/types/members/duplicateNumericIndexers.ts(30,5): error T
     
     interface Array<T> {
         [x: number]: T;
+        ~~~~~~~~~~~~~~~
+!!! error TS2375: Duplicate number index signature.
         [x: number]: T;
         ~~~~~~~~~~~~~~~
 !!! error TS2375: Duplicate number index signature.
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols
index 50c962f9574..41916162553 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols
@@ -1,36 +1,36 @@
 === tests/cases/compiler/duplicateOverloadInTypeAugmentation1.ts ===
 interface Array<T> {
->Array : Symbol(Array, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 0), Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 0))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
->reduce : Symbol(reduce, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29), Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
+>reduce : Symbol(reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
 >callbackfn : Symbol(callbackfn, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 11))
 >previousValue : Symbol(previousValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 24))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 >currentValue : Symbol(currentValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 41))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 >currentIndex : Symbol(currentIndex, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 58))
 >array : Symbol(array, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 80))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 
         initialValue?: T): T;
 >initialValue : Symbol(initialValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 98))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U,
->reduce : Symbol(reduce, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29), Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
+>reduce : Symbol(reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
 >U : Symbol(U, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 11))
 >callbackfn : Symbol(callbackfn, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 14))
 >previousValue : Symbol(previousValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 27))
 >U : Symbol(U, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 11))
 >currentValue : Symbol(currentValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 44))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 >currentIndex : Symbol(currentIndex, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 61))
 >array : Symbol(array, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 83))
->T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 >U : Symbol(U, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 11))
 
         initialValue: U): U;
@@ -40,13 +40,13 @@ interface Array<T> {
 }
 var a: Array<string>;
 >a : Symbol(a, Decl(duplicateOverloadInTypeAugmentation1.ts, 6, 3))
->Array : Symbol(Array, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 0), Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 0))
 
 var r5 = a.reduce((x, y) => x + y);
 >r5 : Symbol(r5, Decl(duplicateOverloadInTypeAugmentation1.ts, 7, 3))
->a.reduce : Symbol(Array.reduce, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29), Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
+>a.reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
 >a : Symbol(a, Decl(duplicateOverloadInTypeAugmentation1.ts, 6, 3))
->reduce : Symbol(Array.reduce, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29), Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
+>reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
 >x : Symbol(x, Decl(duplicateOverloadInTypeAugmentation1.ts, 7, 19))
 >y : Symbol(y, Decl(duplicateOverloadInTypeAugmentation1.ts, 7, 21))
 >x : Symbol(x, Decl(duplicateOverloadInTypeAugmentation1.ts, 7, 19))
diff --git a/tests/baselines/reference/extendBooleanInterface.symbols b/tests/baselines/reference/extendBooleanInterface.symbols
index 1beae75baa7..8e123eb050e 100644
--- a/tests/baselines/reference/extendBooleanInterface.symbols
+++ b/tests/baselines/reference/extendBooleanInterface.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/primitives/boolean/extendBooleanInterface.ts ===
 interface Boolean {
->Boolean : Symbol(Boolean, Decl(extendBooleanInterface.ts, 0, 0), Decl(lib.d.ts, 443, 38), Decl(lib.d.ts, 456, 11))
+>Boolean : Symbol(Boolean, Decl(lib.d.ts, 443, 38), Decl(lib.d.ts, 456, 11), Decl(extendBooleanInterface.ts, 0, 0))
 
     doStuff(): string;
 >doStuff : Symbol(doStuff, Decl(extendBooleanInterface.ts, 0, 19))
diff --git a/tests/baselines/reference/extendNumberInterface.symbols b/tests/baselines/reference/extendNumberInterface.symbols
index 08568fe8218..56d2f8b0014 100644
--- a/tests/baselines/reference/extendNumberInterface.symbols
+++ b/tests/baselines/reference/extendNumberInterface.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/primitives/number/extendNumberInterface.ts ===
 interface Number {
->Number : Symbol(Number, Decl(extendNumberInterface.ts, 0, 0), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
+>Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(extendNumberInterface.ts, 0, 0))
 
     doStuff(): string;
 >doStuff : Symbol(doStuff, Decl(extendNumberInterface.ts, 0, 18))
diff --git a/tests/baselines/reference/extendStringInterface.symbols b/tests/baselines/reference/extendStringInterface.symbols
index f54334de9c5..a72773647a8 100644
--- a/tests/baselines/reference/extendStringInterface.symbols
+++ b/tests/baselines/reference/extendStringInterface.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/primitives/string/extendStringInterface.ts ===
 interface String {
->String : Symbol(String, Decl(extendStringInterface.ts, 0, 0), Decl(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11))
+>String : Symbol(String, Decl(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11), Decl(extendStringInterface.ts, 0, 0))
 
     doStuff(): string;
 >doStuff : Symbol(doStuff, Decl(extendStringInterface.ts, 0, 18))
diff --git a/tests/baselines/reference/externFunc.symbols b/tests/baselines/reference/externFunc.symbols
index ba89ab3fd98..1a02596d7db 100644
--- a/tests/baselines/reference/externFunc.symbols
+++ b/tests/baselines/reference/externFunc.symbols
@@ -1,8 +1,8 @@
 === tests/cases/compiler/externFunc.ts ===
 declare function parseInt(s:string):number;
->parseInt : Symbol(parseInt, Decl(externFunc.ts, 0, 0), Decl(lib.d.ts, 28, 38))
+>parseInt : Symbol(parseInt, Decl(lib.d.ts, 28, 38), Decl(externFunc.ts, 0, 0))
 >s : Symbol(s, Decl(externFunc.ts, 0, 26))
 
 parseInt("2");
->parseInt : Symbol(parseInt, Decl(externFunc.ts, 0, 0), Decl(lib.d.ts, 28, 38))
+>parseInt : Symbol(parseInt, Decl(lib.d.ts, 28, 38), Decl(externFunc.ts, 0, 0))
 
diff --git a/tests/baselines/reference/externFunc.types b/tests/baselines/reference/externFunc.types
index 0fd8dfa646b..ab417859ea5 100644
--- a/tests/baselines/reference/externFunc.types
+++ b/tests/baselines/reference/externFunc.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/externFunc.ts ===
 declare function parseInt(s:string):number;
->parseInt : { (s: string): number; (s: string, radix?: number): number; }
+>parseInt : { (s: string, radix?: number): number; (s: string): number; }
 >s : string
 
 parseInt("2");
 >parseInt("2") : number
->parseInt : { (s: string): number; (s: string, radix?: number): number; }
+>parseInt : { (s: string, radix?: number): number; (s: string): number; }
 >"2" : string
 
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
index 31b33c0964f..3ce4f709b7d 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
@@ -11,7 +11,7 @@ declare module EndGate {
 }
 
 interface Number extends EndGate.ICloneable { }
->Number : Symbol(Number, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
+>Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1))
 >EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24))
 >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 17, 1))
 >ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24))
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols
index 2b38d8984ee..be96d92c357 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols
@@ -11,7 +11,7 @@ module EndGate {
 }
 
 interface Number extends EndGate.ICloneable { }
->Number : Symbol(Number, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
+>Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
 >EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16))
 >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 16, 1))
 >ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16))
@@ -51,7 +51,7 @@ module EndGate.Tweening {
     export class NumberTween extends Tween<Number>{
 >NumberTween : Symbol(NumberTween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 25))
 >Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25))
->Number : Symbol(Number, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
+>Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
 
         constructor(from: number) {
 >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 20, 20))
diff --git a/tests/baselines/reference/inheritedGenericCallSignature.symbols b/tests/baselines/reference/inheritedGenericCallSignature.symbols
index 871fdee2cad..49170401165 100644
--- a/tests/baselines/reference/inheritedGenericCallSignature.symbols
+++ b/tests/baselines/reference/inheritedGenericCallSignature.symbols
@@ -13,7 +13,7 @@ interface I1<T> {
 
 
 interface Object {}
->Object : Symbol(Object, Decl(inheritedGenericCallSignature.ts, 5, 1), Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
+>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11), Decl(inheritedGenericCallSignature.ts, 5, 1))
 
  
 
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.symbols b/tests/baselines/reference/innerBoundLambdaEmit.symbols
index 54be7bc4693..689aa7d075b 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.symbols
+++ b/tests/baselines/reference/innerBoundLambdaEmit.symbols
@@ -9,8 +9,8 @@ module M {
 >bar : Symbol(bar, Decl(innerBoundLambdaEmit.ts, 3, 7))
 }
 interface Array<T> {
->Array : Symbol(Array, Decl(innerBoundLambdaEmit.ts, 4, 1), Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
->T : Symbol(T, Decl(innerBoundLambdaEmit.ts, 5, 16), Decl(lib.d.ts, 1007, 16))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(innerBoundLambdaEmit.ts, 4, 1))
+>T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(innerBoundLambdaEmit.ts, 5, 16))
 
     toFoo(): M.Foo
 >toFoo : Symbol(toFoo, Decl(innerBoundLambdaEmit.ts, 5, 20))
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
index b2fc1d3dbbb..de1f2abc5aa 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
@@ -3,7 +3,7 @@
 // no errors expected below 
 
 interface Function {
->Function : Symbol(Function, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 0, 0), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
+>Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 0, 0))
 
     data: number;
 >data : Symbol(data, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 3, 20))
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols
index 8eb671b53ba..57479c548ee 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts ===
 interface Function {
->Function : Symbol(Function, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 0), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
+>Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 0))
 
     data: number;
 >data : Symbol(data, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 20))
diff --git a/tests/baselines/reference/parserStrictMode8.errors.txt b/tests/baselines/reference/parserStrictMode8.errors.txt
index a925703138c..70cfcc72357 100644
--- a/tests/baselines/reference/parserStrictMode8.errors.txt
+++ b/tests/baselines/reference/parserStrictMode8.errors.txt
@@ -1,10 +1,12 @@
-lib.d.ts(29,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode8.ts(2,10): error TS1100: Invalid use of 'eval' in strict mode.
+tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode8.ts(2,10): error TS2384: Overload signatures must all be ambient or non-ambient.
 
 
-==== tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode8.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode8.ts (2 errors) ====
     "use strict";
     function eval() {
              ~~~~
 !!! error TS1100: Invalid use of 'eval' in strict mode.
+             ~~~~
+!!! error TS2384: Overload signatures must all be ambient or non-ambient.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolType16.symbols b/tests/baselines/reference/symbolType16.symbols
index 02c9b996ba7..1d87ae6a1a4 100644
--- a/tests/baselines/reference/symbolType16.symbols
+++ b/tests/baselines/reference/symbolType16.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/Symbols/symbolType16.ts ===
 interface Symbol {
->Symbol : Symbol(Symbol, Decl(symbolType16.ts, 0, 0), Decl(lib.d.ts, 1186, 52), Decl(lib.d.ts, 1292, 11))
+>Symbol : Symbol(Symbol, Decl(lib.d.ts, 1186, 52), Decl(lib.d.ts, 1292, 11), Decl(symbolType16.ts, 0, 0))
 
     newSymbolProp: number;
 >newSymbolProp : Symbol(newSymbolProp, Decl(symbolType16.ts, 0, 18))
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
index f3e6752ca3b..7c796d47398 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
@@ -1,8 +1,10 @@
 lib.d.ts(521,11): error TS2300: Duplicate identifier 'TemplateStringsArray'.
 tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(2,7): error TS2300: Duplicate identifier 'TemplateStringsArray'.
+tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
 
 
-==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (1 errors) ====
+==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (2 errors) ====
     
     class TemplateStringsArray {
           ~~~~~~~~~~~~~~~~~~~~
@@ -13,5 +15,8 @@ tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(2,7): error TS2
     }
     
     f({}, 10, 10);
+      ~~
+!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
index 97f4c2e794f..4b9cb63d9aa 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
@@ -1,8 +1,10 @@
 lib.d.ts(521,11): error TS2300: Duplicate identifier 'TemplateStringsArray'.
 tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(2,7): error TS2300: Duplicate identifier 'TemplateStringsArray'.
+tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
 
 
-==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (1 errors) ====
+==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (2 errors) ====
     
     class TemplateStringsArray {
           ~~~~~~~~~~~~~~~~~~~~
@@ -13,5 +15,8 @@ tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(2,7): error T
     }
     
     f({}, 10, 10);
+      ~~
+!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file