diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.types b/tests/baselines/reference/TypeGuardWithEnumUnion.types
index 16d999e46f2..61cce562ba5 100644
--- a/tests/baselines/reference/TypeGuardWithEnumUnion.types
+++ b/tests/baselines/reference/TypeGuardWithEnumUnion.types
@@ -35,14 +35,14 @@ function f1(x: Color | string) {
 }
 
 function f2(x: Color | string | string[]) {
->f2 : (x: string | string[] | Color) => void
->x : string | string[] | Color
+>f2 : (x: string | Color | string[]) => void
+>x : string | Color | string[]
 >Color : Color
 
     if (typeof x === "object") {
 >typeof x === "object" : boolean
 >typeof x : string
->x : string | string[] | Color
+>x : string | Color | string[]
 >"object" : string
 
         var y = x;
@@ -55,7 +55,7 @@ function f2(x: Color | string | string[]) {
     if (typeof x === "number") {
 >typeof x === "number" : boolean
 >typeof x : string
->x : string | string[] | Color
+>x : string | Color | string[]
 >"number" : string
 
         var z = x;
@@ -77,7 +77,7 @@ function f2(x: Color | string | string[]) {
     if (typeof x === "string") {
 >typeof x === "string" : boolean
 >typeof x : string
->x : string | string[] | Color
+>x : string | Color | string[]
 >"string" : string
 
         var a = x;
@@ -89,11 +89,11 @@ function f2(x: Color | string | string[]) {
     }
     else {
         var b = x;
->b : string[] | Color
->x : string[] | Color
+>b : Color | string[]
+>x : Color | string[]
 
         var b: Color | string[];
->b : string[] | Color
+>b : Color | string[]
 >Color : Color
     }
 }
diff --git a/tests/baselines/reference/arrayAugment.symbols b/tests/baselines/reference/arrayAugment.symbols
index 8310729032f..f8a614e76a6 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(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))
+>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))
 
     split: (parts: number) => T[][];
 >split : Symbol(split, Decl(arrayAugment.ts, 0, 20))
 >parts : Symbol(parts, Decl(arrayAugment.ts, 1, 12))
->T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(arrayAugment.ts, 0, 16))
+>T : Symbol(T, Decl(arrayAugment.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
 }
 
 var x = [''];
diff --git a/tests/baselines/reference/arrayLiterals.types b/tests/baselines/reference/arrayLiterals.types
index 841de336965..e103241dd0b 100644
--- a/tests/baselines/reference/arrayLiterals.types
+++ b/tests/baselines/reference/arrayLiterals.types
@@ -2,8 +2,8 @@
 // Empty array literal with no contextual type has type Undefined[]
 
 var arr1= [[], [1], ['']];
->arr1 : (string[] | number[])[]
->[[], [1], ['']] : (string[] | number[])[]
+>arr1 : (number[] | string[])[]
+>[[], [1], ['']] : (number[] | string[])[]
 >[] : undefined[]
 >[1] : number[]
 >1 : number
@@ -11,8 +11,8 @@ var arr1= [[], [1], ['']];
 >'' : string
 
 var arr2 = [[null], [1], ['']];
->arr2 : (string[] | number[])[]
->[[null], [1], ['']] : (string[] | number[])[]
+>arr2 : (number[] | string[])[]
+>[[null], [1], ['']] : (number[] | string[])[]
 >[null] : null[]
 >null : null
 >[1] : number[]
diff --git a/tests/baselines/reference/arrayLiterals3.errors.txt b/tests/baselines/reference/arrayLiterals3.errors.txt
index 74cfdb165d7..36714162de0 100644
--- a/tests/baselines/reference/arrayLiterals3.errors.txt
+++ b/tests/baselines/reference/arrayLiterals3.errors.txt
@@ -8,8 +8,8 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(17,5): error
     Type '() => string | number | boolean' is not assignable to type '() => number'.
       Type 'string | number | boolean' is not assignable to type 'number'.
         Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(32,5): error TS2322: Type '(string[] | number[])[]' is not assignable to type 'tup'.
-  Property '0' is missing in type '(string[] | number[])[]'.
+tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(32,5): error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
+  Property '0' is missing in type '(number[] | string[])[]'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(33,5): error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
   Property '0' is missing in type 'number[]'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
@@ -68,8 +68,8 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
     interface myArray2 extends Array<Number|String> { }
     var c0: tup = [...temp2];                         // Error
         ~~
-!!! error TS2322: Type '(string[] | number[])[]' is not assignable to type 'tup'.
-!!! error TS2322:   Property '0' is missing in type '(string[] | number[])[]'.
+!!! error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
+!!! error TS2322:   Property '0' is missing in type '(number[] | string[])[]'.
     var c1: [number, number, number] = [...temp1];    // Error cannot assign number[] to [number, number, number]
         ~~
 !!! error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
diff --git a/tests/baselines/reference/augmentArray.symbols b/tests/baselines/reference/augmentArray.symbols
index 8c52363d601..737d698e046 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(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))
+>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))
 
     (): any[];
 }
diff --git a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
index 81c8b13d207..e8266240f07 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(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11), Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 19))
+>Object : Symbol(Object, Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 19), Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
 
     [n: number]: Foo;
 >n : Symbol(n, Decl(augmentedTypeBracketAccessIndexSignature.ts, 4, 5))
@@ -16,7 +16,7 @@ interface Object {
 }
 
 interface Function {
->Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(augmentedTypeBracketAccessIndexSignature.ts, 5, 1))
+>Function : Symbol(Function, Decl(augmentedTypeBracketAccessIndexSignature.ts, 5, 1), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
 
     [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 cc9c2ba62ef..901081f3e24 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(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11), Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 0))
+>Object : Symbol(Object, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 0), Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
 
     data: number;
 >data : Symbol(data, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 18))
 }
 interface Function {
->Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(augmentedTypeBracketNamedPropertyAccess.ts, 2, 1))
+>Function : Symbol(Function, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 2, 1), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
 
     functionData: string;
 >functionData : Symbol(functionData, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 3, 20))
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
index 52ff0c1001d..d6c97b5db81 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
@@ -17,9 +17,9 @@ declare function foo<T>(obj: I<T>): T
 >T : T
 
 foo({
->foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | number[] | (() => void)
+>foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | (() => void) | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | number | boolean | number[] | (() => void); 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | number | boolean | (() => void) | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
index 6998c9523cc..72a1d5ba04f 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
@@ -17,9 +17,9 @@ declare function foo<T>(obj: I<T>): T
 >T : T
 
 foo({
->foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | number[] | (() => void)
+>foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | (() => void) | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | number | boolean | number[] | (() => void); 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | number | boolean | (() => void) | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
index 1845d145966..5674f6aa393 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
@@ -17,9 +17,9 @@ declare function foo<T>(obj: I<T>): T
 >T : T
 
 foo({
->foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | number[] | (() => void)
+>foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | (() => void) | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: number | number[] | (() => void); 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: number | (() => void) | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
index 54d2afe4f61..93558c075e7 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
@@ -17,9 +17,9 @@ declare function foo<T>(obj: I<T>): T
 >T : T
 
 foo({
->foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | number[] | (() => void)
+>foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | (() => void) | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: number | number[] | (() => void); 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: number | (() => void) | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/contextualSignatureInstantiation.types b/tests/baselines/reference/contextualSignatureInstantiation.types
index e7be6da51c5..49d6871804c 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation.types
@@ -120,35 +120,35 @@ var b = baz(b, b, g);      // Should be number | string
 >g : <T>(x: T, y: T) => T
 
 var d: number[] | string[];
->d : string[] | number[]
+>d : number[] | string[]
 
 var d = foo(h);            // Should be number[] | string[]
->d : string[] | number[]
->foo(h) : string[] | number[]
+>d : number[] | string[]
+>foo(h) : number[] | string[]
 >foo : <T>(cb: (x: number, y: string) => T) => T
 >h : <T, U>(x: T, y: U) => T[] | U[]
 
 var d = bar(1, "one", h);  // Should be number[] | string[]
->d : string[] | number[]
->bar(1, "one", h) : string[] | number[]
+>d : number[] | string[]
+>bar(1, "one", h) : number[] | string[]
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >1 : number
 >"one" : string
 >h : <T, U>(x: T, y: U) => T[] | U[]
 
 var d = bar("one", 1, h);  // Should be number[] | string[]
->d : string[] | number[]
->bar("one", 1, h) : string[] | number[]
+>d : number[] | string[]
+>bar("one", 1, h) : number[] | string[]
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
 >"one" : string
 >1 : number
 >h : <T, U>(x: T, y: U) => T[] | U[]
 
 var d = baz(d, d, g);      // Should be number[] | string[]
->d : string[] | number[]
->baz(d, d, g) : string[] | number[]
+>d : number[] | string[]
+>baz(d, d, g) : number[] | string[]
 >baz : <T, U>(x: T, y: T, cb: (x: T, y: T) => U) => U
->d : string[] | number[]
->d : string[] | number[]
+>d : number[] | string[]
+>d : number[] | string[]
 >g : <T>(x: T, y: T) => T
 
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.types b/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
index 64bede3e2de..d51a0e32dc8 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
@@ -12,7 +12,7 @@ type arrayString = Array<String>
 >String : String
 
 type someArray = Array<String> | number[];
->someArray : number[] | String[]
+>someArray : String[] | number[]
 >Array : T[]
 >String : String
 
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.types b/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
index aea7b2ae15a..63d5d074a8d 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
@@ -12,7 +12,7 @@ type arrayString = Array<String>
 >String : String
 
 type someArray = Array<String> | number[];
->someArray : number[] | String[]
+>someArray : String[] | number[]
 >Array : T[]
 >String : String
 
diff --git a/tests/baselines/reference/duplicateNumericIndexers.errors.txt b/tests/baselines/reference/duplicateNumericIndexers.errors.txt
index c4c7883021a..0e9b013f6ff 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 (8 errors) ====
+==== tests/cases/conformance/types/members/duplicateNumericIndexers.ts (6 errors) ====
     // it is an error to have duplicate index signatures of the same kind in a type
     
     interface Number {
@@ -20,8 +20,6 @@ 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.
@@ -29,8 +27,6 @@ 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 41916162553..50c962f9574 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(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))
+>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))
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
->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))
+>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))
 >callbackfn : Symbol(callbackfn, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 11))
 >previousValue : Symbol(previousValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 24))
->T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
+>T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
 >currentValue : Symbol(currentValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 41))
->T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
+>T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
 >currentIndex : Symbol(currentIndex, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 58))
 >array : Symbol(array, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 80))
->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))
+>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))
 
         initialValue?: T): T;
 >initialValue : Symbol(initialValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 98))
->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))
+>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))
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U,
->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))
+>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))
 >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(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
+>T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 16))
 >currentIndex : Symbol(currentIndex, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 61))
 >array : Symbol(array, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 83))
->T : Symbol(T, Decl(lib.d.ts, 1007, 16), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
+>T : Symbol(T, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16), Decl(lib.d.ts, 1007, 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(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 0))
+>Array : Symbol(Array, Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 0), Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
 
 var r5 = a.reduce((x, y) => x + y);
 >r5 : Symbol(r5, Decl(duplicateOverloadInTypeAugmentation1.ts, 7, 3))
->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.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 : Symbol(a, Decl(duplicateOverloadInTypeAugmentation1.ts, 6, 3))
->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))
+>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))
 >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 8e123eb050e..1beae75baa7 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(lib.d.ts, 443, 38), Decl(lib.d.ts, 456, 11), Decl(extendBooleanInterface.ts, 0, 0))
+>Boolean : Symbol(Boolean, Decl(extendBooleanInterface.ts, 0, 0), Decl(lib.d.ts, 443, 38), Decl(lib.d.ts, 456, 11))
 
     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 56d2f8b0014..08568fe8218 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(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(extendNumberInterface.ts, 0, 0))
+>Number : Symbol(Number, Decl(extendNumberInterface.ts, 0, 0), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
 
     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 a72773647a8..f54334de9c5 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(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11), Decl(extendStringInterface.ts, 0, 0))
+>String : Symbol(String, Decl(extendStringInterface.ts, 0, 0), Decl(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11))
 
     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 1a02596d7db..ba89ab3fd98 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(lib.d.ts, 28, 38), Decl(externFunc.ts, 0, 0))
+>parseInt : Symbol(parseInt, Decl(externFunc.ts, 0, 0), Decl(lib.d.ts, 28, 38))
 >s : Symbol(s, Decl(externFunc.ts, 0, 26))
 
 parseInt("2");
->parseInt : Symbol(parseInt, Decl(lib.d.ts, 28, 38), Decl(externFunc.ts, 0, 0))
+>parseInt : Symbol(parseInt, Decl(externFunc.ts, 0, 0), Decl(lib.d.ts, 28, 38))
 
diff --git a/tests/baselines/reference/externFunc.types b/tests/baselines/reference/externFunc.types
index ab417859ea5..0fd8dfa646b 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, radix?: number): number; (s: string): number; }
+>parseInt : { (s: string): number; (s: string, radix?: number): number; }
 >s : string
 
 parseInt("2");
 >parseInt("2") : number
->parseInt : { (s: string, radix?: number): number; (s: string): number; }
+>parseInt : { (s: string): number; (s: string, radix?: number): number; }
 >"2" : string
 
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
index 3ce4f709b7d..31b33c0964f 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(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1))
+>Number : Symbol(Number, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
 >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 be96d92c357..2b38d8984ee 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(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
+>Number : Symbol(Number, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
 >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(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
+>Number : Symbol(Number, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1), Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
 
         constructor(from: number) {
 >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 20, 20))
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types
index 81fa915ab03..ecfbf75e864 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.types
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.types
@@ -40,8 +40,8 @@ var f = [[], [1]]; // number[][]
 >1 : number
 
 var g = [[1], ['']]; // {}[]
->g : (string[] | number[])[]
->[[1], ['']] : (string[] | number[])[]
+>g : (number[] | string[])[]
+>[[1], ['']] : (number[] | string[])[]
 >[1] : number[]
 >1 : number
 >[''] : string[]
diff --git a/tests/baselines/reference/inheritedGenericCallSignature.symbols b/tests/baselines/reference/inheritedGenericCallSignature.symbols
index 49170401165..871fdee2cad 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(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11), Decl(inheritedGenericCallSignature.ts, 5, 1))
+>Object : Symbol(Object, Decl(inheritedGenericCallSignature.ts, 5, 1), Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
 
  
 
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.symbols b/tests/baselines/reference/innerBoundLambdaEmit.symbols
index 689aa7d075b..54be7bc4693 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(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))
+>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))
 
     toFoo(): M.Foo
 >toFoo : Symbol(toFoo, Decl(innerBoundLambdaEmit.ts, 5, 20))
diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.types b/tests/baselines/reference/logicalOrOperatorWithEveryType.types
index c98966acb98..ecf6b23e729 100644
--- a/tests/baselines/reference/logicalOrOperatorWithEveryType.types
+++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.types
@@ -379,8 +379,8 @@ var rg7 = a7 || a6;         // object    || enum is object | enum
 >a6 : E
 
 var rg8 = a8 || a6;         // array     || enum is array | enum
->rg8 : string[] | E
->a8 || a6 : string[] | E
+>rg8 : E | string[]
+>a8 || a6 : E | string[]
 >a8 : string[]
 >a6 : E
 
@@ -439,8 +439,8 @@ var rh7 = a7 || a7;         // object    || object is object
 >a7 : { a: string; }
 
 var rh8 = a8 || a7;         // array     || object is array | object
->rh8 : string[] | { a: string; }
->a8 || a7 : string[] | { a: string; }
+>rh8 : { a: string; } | string[]
+>a8 || a7 : { a: string; } | string[]
 >a8 : string[]
 >a7 : { a: string; }
 
@@ -487,14 +487,14 @@ var ri5 = a5 || a8;         // void      || array is void | array
 >a8 : string[]
 
 var ri6 = a6 || a8;         // enum      || array is enum | array
->ri6 : string[] | E
->a6 || a8 : string[] | E
+>ri6 : E | string[]
+>a6 || a8 : E | string[]
 >a6 : E
 >a8 : string[]
 
 var ri7 = a7 || a8;         // object    || array is object | array
->ri7 : string[] | { a: string; }
->a7 || a8 : string[] | { a: string; }
+>ri7 : { a: string; } | string[]
+>a7 || a8 : { a: string; } | string[]
 >a7 : { a: string; }
 >a8 : string[]
 
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
index de1f2abc5aa..b2fc1d3dbbb 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(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 0, 0))
+>Function : Symbol(Function, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 0, 0), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
 
     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 57479c548ee..8eb671b53ba 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(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 0))
+>Function : Symbol(Function, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 0), Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
 
     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 70cfcc72357..a925703138c 100644
--- a/tests/baselines/reference/parserStrictMode8.errors.txt
+++ b/tests/baselines/reference/parserStrictMode8.errors.txt
@@ -1,12 +1,10 @@
+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 (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode8.ts (1 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 1d87ae6a1a4..02c9b996ba7 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(lib.d.ts, 1186, 52), Decl(lib.d.ts, 1292, 11), Decl(symbolType16.ts, 0, 0))
+>Symbol : Symbol(Symbol, Decl(symbolType16.ts, 0, 0), Decl(lib.d.ts, 1186, 52), Decl(lib.d.ts, 1292, 11))
 
     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 7c796d47398..f3e6752ca3b 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
@@ -1,10 +1,8 @@
 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 (2 errors) ====
+==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (1 errors) ====
     
     class TemplateStringsArray {
           ~~~~~~~~~~~~~~~~~~~~
@@ -15,8 +13,5 @@ tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): 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 4b9cb63d9aa..97f4c2e794f 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
@@ -1,10 +1,8 @@
 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 (2 errors) ====
+==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (1 errors) ====
     
     class TemplateStringsArray {
           ~~~~~~~~~~~~~~~~~~~~
@@ -15,8 +13,5 @@ tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): 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
diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.types b/tests/baselines/reference/typeGuardsInConditionalExpression.types
index dffcca7e2be..3965abfe962 100644
--- a/tests/baselines/reference/typeGuardsInConditionalExpression.types
+++ b/tests/baselines/reference/typeGuardsInConditionalExpression.types
@@ -363,9 +363,9 @@ function foo12(x: number | string | boolean) {
 >10 : number
 >x.toString().length : number
 >x.toString() : string
->x.toString : () => string
+>x.toString : (radix?: number) => string
 >x : string | number | boolean
->toString : () => string
+>toString : (radix?: number) => string
 >length : number
 
         : ((b = x) // x is number | boolean | string  - changed in true branch