diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f2b01c6fd5..f4fc99406e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10636,6 +10636,8 @@ namespace ts {
                     return elaborateArrayLiteral(node as ArrayLiteralExpression, source, target, relation);
                 case SyntaxKind.JsxAttributes:
                     return elaborateJsxAttributes(node as JsxAttributes, source, target, relation);
+                case SyntaxKind.ArrowFunction:
+                    return elaborateArrowFunction(node as ArrowFunction, source, target, relation);
             }
             return false;
         }
@@ -10661,6 +10663,46 @@ namespace ts {
             return false;
         }
 
+        function elaborateArrowFunction(node: ArrowFunction, source: Type, target: Type, relation: Map<RelationComparisonResult>): boolean {
+            // Don't elaborate blocks
+            if (isBlock(node.body)) {
+                return false;
+            }
+            // Or functions with annotated parameter types
+            if (some(node.parameters, ts.hasType)) {
+                return false;
+            }
+            const sourceSig = getSingleCallSignature(source);
+            if (!sourceSig) {
+                return false;
+            }
+            const targetSignatures = getSignaturesOfType(target, SignatureKind.Call);
+            if (!length(targetSignatures)) {
+                return false;
+            }
+            const returnExpression = node.body;
+            const sourceReturn = getReturnTypeOfSignature(sourceSig);
+            const targetReturn = getUnionType(map(targetSignatures, getReturnTypeOfSignature));
+            if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
+                const elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                if (elaborated) {
+                    return elaborated;
+                }
+                const resultObj: { error?: Diagnostic } = {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
+                if (resultObj.error) {
+                    if (target.symbol && length(target.symbol.declarations)) {
+                        addRelatedInfo(resultObj.error, createDiagnosticForNode(
+                            target.symbol.declarations[0],
+                            Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature,
+                        ));
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
         type ElaborationIterator = IterableIterator<{ errorNode: Node, innerExpression: Expression | undefined, nameType: Type, errorMessage?: DiagnosticMessage | undefined }>;
         /**
          * For every element returned from the iterator, checks that element to issue an error on a property of that element's type
@@ -10674,7 +10716,7 @@ namespace ts {
                 const { errorNode: prop, innerExpression: next, nameType, errorMessage } = status.value;
                 const sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
                 const targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !isTypeAssignableTo(sourcePropType, targetPropType)) {
+                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
                     const elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
                     if (elaborated) {
                         reportedError = true;
@@ -10699,19 +10741,22 @@ namespace ts {
                                 const indexInfo = isTypeAssignableToKind(nameType, TypeFlags.NumberLike) && getIndexInfoOfType(target, IndexKind.Number) ||
                                     getIndexInfoOfType(target, IndexKind.String) ||
                                     undefined;
-                                if (indexInfo && indexInfo.declaration) {
+                                if (indexInfo && indexInfo.declaration && !getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
                                     addRelatedInfo(reportedDiag, createDiagnosticForNode(indexInfo.declaration, Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
 
                             if (!issuedElaboration && (targetProp && length(targetProp.declarations) || target.symbol && length(target.symbol.declarations))) {
-                                addRelatedInfo(reportedDiag, createDiagnosticForNode(
-                                    targetProp && length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0],
-                                    Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1,
-                                    propertyName && !(nameType.flags & TypeFlags.UniqueESSymbol) ? unescapeLeadingUnderscores(propertyName) : typeToString(nameType),
-                                    typeToString(target)
-                                ));
+                                const targetNode = targetProp && length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
+                                if (!getSourceFileOfNode(targetNode).hasNoDefaultLib) {
+                                    addRelatedInfo(reportedDiag, createDiagnosticForNode(
+                                        targetNode,
+                                        Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1,
+                                        propertyName && !(nameType.flags & TypeFlags.UniqueESSymbol) ? unescapeLeadingUnderscores(propertyName) : typeToString(nameType),
+                                        typeToString(target)
+                                    ));
+                                }
                             }
                         }
                         reportedError = true;
@@ -10750,6 +10795,11 @@ namespace ts {
             if (isTupleLikeType(source)) {
                 return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
             }
+            // recreate a tuple from the elements, if possible
+            const tupleizedType = checkArrayLiteral(node, CheckMode.Contextual, /*forceTuple*/ true);
+            if (isTupleLikeType(tupleizedType)) {
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+            }
             return false;
         }
 
@@ -16981,7 +17031,7 @@ namespace ts {
                 (node.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>node).operatorToken.kind === SyntaxKind.EqualsToken);
         }
 
-        function checkArrayLiteral(node: ArrayLiteralExpression, checkMode: CheckMode | undefined): Type {
+        function checkArrayLiteral(node: ArrayLiteralExpression, checkMode: CheckMode | undefined, forceTuple: boolean | undefined): Type {
             const elements = node.elements;
             const elementCount = elements.length;
             let hasNonEndingSpreadElement = false;
@@ -17003,7 +17053,7 @@ namespace ts {
                     // get the contextual element type from it. So we do something similar to
                     // getContextualTypeForElementExpression, which will crucially not error
                     // if there is no index type / iterated type.
-                    const restArrayType = checkExpression((<SpreadElement>e).expression, checkMode);
+                    const restArrayType = checkExpression((<SpreadElement>e).expression, checkMode, forceTuple);
                     const restElementType = getIndexTypeOfType(restArrayType, IndexKind.Number) ||
                         getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
                     if (restElementType) {
@@ -17012,7 +17062,7 @@ namespace ts {
                 }
                 else {
                     const elementContextualType = getContextualTypeForElementExpression(contextualType, index);
-                    const type = checkExpressionForMutableLocation(e, checkMode, elementContextualType);
+                    const type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
                 if (index < elementCount - 1 && e.kind === SyntaxKind.SpreadElement) {
@@ -17050,6 +17100,9 @@ namespace ts {
                     }
                     return createTupleType(elementTypes, minLength, hasRestElement);
                 }
+                else if (forceTuple) {
+                    return createTupleType(elementTypes, minLength, hasRestElement);
+                }
             }
             return getArrayLiteralType(elementTypes, UnionReduction.Subtype);
         }
@@ -22097,11 +22150,11 @@ namespace ts {
             return false;
         }
 
-        function checkExpressionForMutableLocation(node: Expression, checkMode: CheckMode | undefined, contextualType?: Type): Type {
+        function checkExpressionForMutableLocation(node: Expression, checkMode: CheckMode | undefined, contextualType?: Type, forceTuple?: boolean): Type {
             if (arguments.length === 2) {
                 contextualType = getContextualType(node);
             }
-            const type = checkExpression(node, checkMode);
+            const type = checkExpression(node, checkMode, forceTuple);
             return isTypeAssertion(node) ? type :
                 getWidenedLiteralLikeTypeForContextualType(type, contextualType);
         }
@@ -22201,13 +22254,13 @@ namespace ts {
         // object, it serves as an indicator that all contained function and arrow expressions should be considered to
         // have the wildcard function type; this form of type check is used during overload resolution to exclude
         // contextually typed function and arrow expressions in the initial phase.
-        function checkExpression(node: Expression | QualifiedName, checkMode?: CheckMode): Type {
+        function checkExpression(node: Expression | QualifiedName, checkMode?: CheckMode, forceTuple?: boolean): Type {
             let type: Type;
             if (node.kind === SyntaxKind.QualifiedName) {
                 type = checkQualifiedName(<QualifiedName>node);
             }
             else {
-                const uninstantiatedType = checkExpressionWorker(node, checkMode);
+                const uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             }
 
@@ -22237,7 +22290,7 @@ namespace ts {
             return checkExpression(node.expression, checkMode);
         }
 
-        function checkExpressionWorker(node: Expression, checkMode: CheckMode | undefined): Type {
+        function checkExpressionWorker(node: Expression, checkMode: CheckMode | undefined, forceTuple?: boolean): Type {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
                     return checkIdentifier(<Identifier>node);
@@ -22262,7 +22315,7 @@ namespace ts {
                 case SyntaxKind.RegularExpressionLiteral:
                     return globalRegExpType;
                 case SyntaxKind.ArrayLiteralExpression:
-                    return checkArrayLiteral(<ArrayLiteralExpression>node, checkMode);
+                    return checkArrayLiteral(<ArrayLiteralExpression>node, checkMode, forceTuple);
                 case SyntaxKind.ObjectLiteralExpression:
                     return checkObjectLiteral(<ObjectLiteralExpression>node, checkMode);
                 case SyntaxKind.PropertyAccessExpression:
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index d083c475bc..eb83d48ae7 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3890,6 +3890,10 @@
         "category": "Message",
         "code": 6501
     },
+    "The expected type comes from the return type of this signature.": {
+        "category": "Message",
+        "code": 6502
+    },
 
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
diff --git a/tests/baselines/reference/arrayLiteralTypeInference.errors.txt b/tests/baselines/reference/arrayLiteralTypeInference.errors.txt
index a2c4597127..efffc256a8 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.errors.txt
+++ b/tests/baselines/reference/arrayLiteralTypeInference.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/arrayLiteralTypeInference.ts(14,14): error TS2322: Type '({ id: number; trueness: boolean; } | { id: number; name: string; })[]' is not assignable to type 'Action[]'.
-  Type '{ id: number; trueness: boolean; } | { id: number; name: string; }' is not assignable to type 'Action'.
-    Type '{ id: number; trueness: boolean; }' is not assignable to type 'Action'.
-      Object literal may only specify known properties, and 'trueness' does not exist in type 'Action'.
-tests/cases/compiler/arrayLiteralTypeInference.ts(31,18): error TS2322: Type '({ id: number; trueness: boolean; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-  Type '{ id: number; trueness: boolean; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-    Type '{ id: number; trueness: boolean; }' is not assignable to type '{ id: number; }'.
-      Object literal may only specify known properties, and 'trueness' does not exist in type '{ id: number; }'.
+tests/cases/compiler/arrayLiteralTypeInference.ts(14,14): error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type 'Action'.
+  Object literal may only specify known properties, and 'trueness' does not exist in type 'Action'.
+tests/cases/compiler/arrayLiteralTypeInference.ts(15,14): error TS2322: Type '{ id: number; name: string; }' is not assignable to type 'Action'.
+  Object literal may only specify known properties, and 'name' does not exist in type 'Action'.
+tests/cases/compiler/arrayLiteralTypeInference.ts(31,18): error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type '{ id: number; }'.
+  Object literal may only specify known properties, and 'trueness' does not exist in type '{ id: number; }'.
+tests/cases/compiler/arrayLiteralTypeInference.ts(32,18): error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+  Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
 
 
-==== tests/cases/compiler/arrayLiteralTypeInference.ts (2 errors) ====
+==== tests/cases/compiler/arrayLiteralTypeInference.ts (4 errors) ====
     class Action {
         id: number;
     }
@@ -24,11 +24,12 @@ tests/cases/compiler/arrayLiteralTypeInference.ts(31,18): error TS2322: Type '({
     var x1: Action[] = [
         { id: 2, trueness: false },
                  ~~~~~~~~~~~~~~~
-!!! error TS2322: Type '({ id: number; trueness: boolean; } | { id: number; name: string; })[]' is not assignable to type 'Action[]'.
-!!! error TS2322:   Type '{ id: number; trueness: boolean; } | { id: number; name: string; }' is not assignable to type 'Action'.
-!!! error TS2322:     Type '{ id: number; trueness: boolean; }' is not assignable to type 'Action'.
-!!! error TS2322:       Object literal may only specify known properties, and 'trueness' does not exist in type 'Action'.
+!!! error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type 'Action'.
+!!! error TS2322:   Object literal may only specify known properties, and 'trueness' does not exist in type 'Action'.
         { id: 3, name: "three" }
+                 ~~~~~~~~~~~~~
+!!! error TS2322: Type '{ id: number; name: string; }' is not assignable to type 'Action'.
+!!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type 'Action'.
     ]
     
     var x2: Action[] = [
@@ -46,11 +47,12 @@ tests/cases/compiler/arrayLiteralTypeInference.ts(31,18): error TS2322: Type '({
         [
             { id: 2, trueness: false },
                      ~~~~~~~~~~~~~~~
-!!! error TS2322: Type '({ id: number; trueness: boolean; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-!!! error TS2322:   Type '{ id: number; trueness: boolean; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Type '{ id: number; trueness: boolean; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:       Object literal may only specify known properties, and 'trueness' does not exist in type '{ id: number; }'.
+!!! error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type '{ id: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'trueness' does not exist in type '{ id: number; }'.
             { id: 3, name: "three" }
+                     ~~~~~~~~~~~~~
+!!! error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
         ]
     
     var z2: { id: number }[] =
diff --git a/tests/baselines/reference/arrayLiterals.errors.txt b/tests/baselines/reference/arrayLiterals.errors.txt
index f5fe71b79a..4b9ca295f9 100644
--- a/tests/baselines/reference/arrayLiterals.errors.txt
+++ b/tests/baselines/reference/arrayLiterals.errors.txt
@@ -1,11 +1,10 @@
-tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts(24,77): error TS2322: Type '({ a: string; b: number; c: string; } | { a: string; b: number; c: number; })[]' is not assignable to type '{ [n: number]: { a: string; b: number; }; }'.
-  Index signatures are incompatible.
-    Type '{ a: string; b: number; c: string; } | { a: string; b: number; c: number; }' is not assignable to type '{ a: string; b: number; }'.
-      Type '{ a: string; b: number; c: string; }' is not assignable to type '{ a: string; b: number; }'.
-        Object literal may only specify known properties, and 'c' does not exist in type '{ a: string; b: number; }'.
+tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts(24,77): error TS2322: Type '{ a: string; b: number; c: string; }' is not assignable to type '{ a: string; b: number; }'.
+  Object literal may only specify known properties, and 'c' does not exist in type '{ a: string; b: number; }'.
+tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts(24,101): error TS2322: Type '{ a: string; b: number; c: number; }' is not assignable to type '{ a: string; b: number; }'.
+  Object literal may only specify known properties, and 'c' does not exist in type '{ a: string; b: number; }'.
 
 
-==== tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts (1 errors) ====
+==== tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts (2 errors) ====
     // Empty array literal with no contextual type has type Undefined[]
     
     var arr1= [[], [1], ['']];
@@ -31,11 +30,13 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts(24,77): error
     // Contextual type C with numeric index signature makes array literal of EveryType E of type BCT(E,C)[]
     var context1: { [n: number]: { a: string; b: number; }; } = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }];
                                                                                 ~~~~~
-!!! error TS2322: Type '({ a: string; b: number; c: string; } | { a: string; b: number; c: number; })[]' is not assignable to type '{ [n: number]: { a: string; b: number; }; }'.
-!!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type '{ a: string; b: number; c: string; } | { a: string; b: number; c: number; }' is not assignable to type '{ a: string; b: number; }'.
-!!! error TS2322:       Type '{ a: string; b: number; c: string; }' is not assignable to type '{ a: string; b: number; }'.
-!!! error TS2322:         Object literal may only specify known properties, and 'c' does not exist in type '{ a: string; b: number; }'.
+!!! error TS2322: Type '{ a: string; b: number; c: string; }' is not assignable to type '{ a: string; b: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'c' does not exist in type '{ a: string; b: number; }'.
+!!! related TS6501 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts:24:17: The expected type comes from this index signature.
+                                                                                                        ~~~~
+!!! error TS2322: Type '{ a: string; b: number; c: number; }' is not assignable to type '{ a: string; b: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'c' does not exist in type '{ a: string; b: number; }'.
+!!! related TS6501 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts:24:17: The expected type comes from this index signature.
     var context2 = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }];
     
     // Contextual type C with numeric index signature of type Base makes array literal of Derived have type Base[]
diff --git a/tests/baselines/reference/arraySigChecking.errors.txt b/tests/baselines/reference/arraySigChecking.errors.txt
index 1968957363..a1f219919d 100644
--- a/tests/baselines/reference/arraySigChecking.errors.txt
+++ b/tests/baselines/reference/arraySigChecking.errors.txt
@@ -1,12 +1,10 @@
 tests/cases/compiler/arraySigChecking.ts(11,17): error TS1023: An index signature parameter type must be 'string' or 'number'.
-tests/cases/compiler/arraySigChecking.ts(18,5): error TS2322: Type 'void[]' is not assignable to type 'string[]'.
-  Type 'void' is not assignable to type 'string'.
-tests/cases/compiler/arraySigChecking.ts(22,1): error TS2322: Type 'number[][]' is not assignable to type 'number[][][]'.
-  Type 'number[]' is not assignable to type 'number[][]'.
-    Type 'number' is not assignable to type 'number[]'.
+tests/cases/compiler/arraySigChecking.ts(18,27): error TS2322: Type 'void' is not assignable to type 'string'.
+tests/cases/compiler/arraySigChecking.ts(22,13): error TS2322: Type 'number' is not assignable to type 'number[]'.
+tests/cases/compiler/arraySigChecking.ts(22,16): error TS2322: Type 'number' is not assignable to type 'number[]'.
 
 
-==== tests/cases/compiler/arraySigChecking.ts (3 errors) ====
+==== tests/cases/compiler/arraySigChecking.ts (4 errors) ====
     declare module M {
         interface iBar { t: any; }
         interface iFoo extends iBar {
@@ -27,17 +25,16 @@ tests/cases/compiler/arraySigChecking.ts(22,1): error TS2322: Type 'number[][]'
     }
     var myVar: myInt;
     var strArray: string[] = [myVar.voidFn()];
-        ~~~~~~~~
-!!! error TS2322: Type 'void[]' is not assignable to type 'string[]'.
-!!! error TS2322:   Type 'void' is not assignable to type 'string'.
+                              ~~~~~~~~~~~~~~
+!!! error TS2322: Type 'void' is not assignable to type 'string'.
     
     
     var myArray: number[][][];
     myArray = [[1, 2]];
-    ~~~~~~~
-!!! error TS2322: Type 'number[][]' is not assignable to type 'number[][][]'.
-!!! error TS2322:   Type 'number[]' is not assignable to type 'number[][]'.
-!!! error TS2322:     Type 'number' is not assignable to type 'number[]'.
+                ~
+!!! error TS2322: Type 'number' is not assignable to type 'number[]'.
+                   ~
+!!! error TS2322: Type 'number' is not assignable to type 'number[]'.
     
     function isEmpty(l: { length: number }) {
         return l.length === 0;
diff --git a/tests/baselines/reference/assignmentCompatBug5.errors.txt b/tests/baselines/reference/assignmentCompatBug5.errors.txt
index 44e28f15d8..6a5c5569c8 100644
--- a/tests/baselines/reference/assignmentCompatBug5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBug5.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/assignmentCompatBug5.ts(2,8): error TS2345: Argument of type '{ b: number; }' is not assignable to parameter of type '{ a: number; }'.
   Object literal may only specify known properties, and 'b' does not exist in type '{ a: number; }'.
-tests/cases/compiler/assignmentCompatBug5.ts(5,6): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'number[]'.
-  Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/assignmentCompatBug5.ts(5,7): error TS2322: Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/assignmentCompatBug5.ts(5,12): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/assignmentCompatBug5.ts(8,6): error TS2345: Argument of type '(s: string) => void' is not assignable to parameter of type '(n: number) => number'.
   Types of parameters 's' and 'n' are incompatible.
     Type 'number' is not assignable to type 'string'.
@@ -9,7 +9,7 @@ tests/cases/compiler/assignmentCompatBug5.ts(9,6): error TS2345: Argument of typ
   Type 'void' is not assignable to type 'number'.
 
 
-==== tests/cases/compiler/assignmentCompatBug5.ts (4 errors) ====
+==== tests/cases/compiler/assignmentCompatBug5.ts (5 errors) ====
     function foo1(x: { a: number; }) { }
     foo1({ b: 5 });
            ~~~~
@@ -18,9 +18,10 @@ tests/cases/compiler/assignmentCompatBug5.ts(9,6): error TS2345: Argument of typ
     
     function foo2(x: number[]) { }
     foo2(["s", "t"]);
-         ~~~~~~~~~~
-!!! error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'number[]'.
-!!! error TS2345:   Type 'string' is not assignable to type 'number'.
+          ~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+               ~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
     
     function foo3(x: (n: number) =>number) { };
     foo3((s:string) => { });
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
index 8ba04d8ab2..9e28f5e917 100644
--- a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
+++ b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
@@ -10,7 +10,6 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type
     var errObj: Object = { toString: 0 }; // Error, incompatible toString
                            ~~~~~~~~
 !!! error TS2322: Type 'number' is not assignable to type '() => string'.
-!!! related TS6500 /.ts/lib.es5.d.ts:125:5: The expected type comes from property 'toString' which is declared here on type 'Object'
     var goodObj: Object = {
         toString(x?) {
             return "";
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
index 181bfcc907..cee9236d63 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,59): error TS2345: Argument of type '(c: C) => B' is not assignable to parameter of type '(x: C) => C'.
-  Type 'B' is not assignable to type 'C'.
-    Property 'z' is missing in type 'B'.
+tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,64): error TS2322: Type 'B' is not assignable to type 'C'.
+  Property 'z' is missing in type 'B'.
 
 
 ==== tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts (1 errors) ====
@@ -23,7 +22,7 @@ tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParamete
     
     // Ok to go down the chain, but error to try to climb back up
     (new Chain(new A)).then(a => new B).then(b => new C).then(c => new B).then(b => new A);
-                                                              ~~~~~~~~~~
-!!! error TS2345: Argument of type '(c: C) => B' is not assignable to parameter of type '(x: C) => C'.
-!!! error TS2345:   Type 'B' is not assignable to type 'C'.
-!!! error TS2345:     Property 'z' is missing in type 'B'.
\ No newline at end of file
+                                                                   ~~~~~
+!!! error TS2322: Type 'B' is not assignable to type 'C'.
+!!! error TS2322:   Property 'z' is missing in type 'B'.
+!!! related TS6502 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts:3:27: The expected type comes from the return type of this signature.
\ No newline at end of file
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt
index 56f4cad5a4..6f03e71188 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(7,43): error TS2345: Argument of type '(ss: S) => T' is not assignable to parameter of type '(x: S) => S'.
-  Type 'T' is not assignable to type 'S'.
-tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(10,29): error TS2345: Argument of type '(ss: S) => T' is not assignable to parameter of type '(x: S) => S'.
-  Type 'T' is not assignable to type 'S'.
+tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(7,49): error TS2322: Type 'T' is not assignable to type 'S'.
+tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(10,35): error TS2322: Type 'T' is not assignable to type 'S'.
 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(32,9): error TS2322: Type '""' is not assignable to type 'number'.
 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(36,9): error TS2322: Type '""' is not assignable to type 'number'.
 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(37,9): error TS2322: Type '""' is not assignable to type 'number'.
@@ -15,15 +13,15 @@ tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParamete
             var s: S;
             // Ok to go down the chain, but error to climb up the chain
             (new Chain(t)).then(tt => s).then(ss => t);
-                                              ~~~~~~~
-!!! error TS2345: Argument of type '(ss: S) => T' is not assignable to parameter of type '(x: S) => S'.
-!!! error TS2345:   Type 'T' is not assignable to type 'S'.
+                                                    ~
+!!! error TS2322: Type 'T' is not assignable to type 'S'.
+!!! related TS6502 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts:3:27: The expected type comes from the return type of this signature.
     
             // But error to try to climb up the chain
             (new Chain(s)).then(ss => t);
-                                ~~~~~~~
-!!! error TS2345: Argument of type '(ss: S) => T' is not assignable to parameter of type '(x: S) => S'.
-!!! error TS2345:   Type 'T' is not assignable to type 'S'.
+                                      ~
+!!! error TS2322: Type 'T' is not assignable to type 'S'.
+!!! related TS6502 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts:3:27: The expected type comes from the return type of this signature.
     
             // Staying at T or S should be fine
             (new Chain(t)).then(tt => t).then(tt => t).then(tt => t);
diff --git a/tests/baselines/reference/contextualTyping11.errors.txt b/tests/baselines/reference/contextualTyping11.errors.txt
index 0b7cf231c1..3aadb41cc0 100644
--- a/tests/baselines/reference/contextualTyping11.errors.txt
+++ b/tests/baselines/reference/contextualTyping11.errors.txt
@@ -1,11 +1,9 @@
-tests/cases/compiler/contextualTyping11.ts(1,20): error TS2322: Type 'foo[]' is not assignable to type '{ id: number; }[]'.
-  Type 'foo' is not assignable to type '{ id: number; }'.
-    Property 'id' is missing in type 'foo'.
+tests/cases/compiler/contextualTyping11.ts(1,42): error TS2322: Type 'foo' is not assignable to type '{ id: number; }'.
+  Property 'id' is missing in type 'foo'.
 
 
 ==== tests/cases/compiler/contextualTyping11.ts (1 errors) ====
     class foo { public bar:{id:number;}[] = [<foo>({})]; }
-                       ~~~
-!!! error TS2322: Type 'foo[]' is not assignable to type '{ id: number; }[]'.
-!!! error TS2322:   Type 'foo' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Property 'id' is missing in type 'foo'.
\ No newline at end of file
+                                             ~~~~~~~~~
+!!! error TS2322: Type 'foo' is not assignable to type '{ id: number; }'.
+!!! error TS2322:   Property 'id' is missing in type 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping12.errors.txt b/tests/baselines/reference/contextualTyping12.errors.txt
index 22ed6ad931..3a2225b681 100644
--- a/tests/baselines/reference/contextualTyping12.errors.txt
+++ b/tests/baselines/reference/contextualTyping12.errors.txt
@@ -1,13 +1,9 @@
-tests/cases/compiler/contextualTyping12.ts(1,57): error TS2322: Type '({ id: number; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-  Type '{ id: number; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-    Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
-      Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
+tests/cases/compiler/contextualTyping12.ts(1,57): error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+  Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping12.ts (1 errors) ====
     class foo { public bar:{id:number;}[] = [{id:1}, {id:2, name:"foo"}]; }
                                                             ~~~~~~~~~~
-!!! error TS2322: Type '({ id: number; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-!!! error TS2322:   Type '{ id: number; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:       Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping20.errors.txt b/tests/baselines/reference/contextualTyping20.errors.txt
index a9112f1db8..968fb8f2dc 100644
--- a/tests/baselines/reference/contextualTyping20.errors.txt
+++ b/tests/baselines/reference/contextualTyping20.errors.txt
@@ -1,13 +1,9 @@
-tests/cases/compiler/contextualTyping20.ts(1,58): error TS2322: Type '({ id: number; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-  Type '{ id: number; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-    Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
-      Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
+tests/cases/compiler/contextualTyping20.ts(1,58): error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+  Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping20.ts (1 errors) ====
     var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2, name:"foo"}];
                                                              ~~~~~~~~~~
-!!! error TS2322: Type '({ id: number; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-!!! error TS2322:   Type '{ id: number; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:       Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping21.errors.txt b/tests/baselines/reference/contextualTyping21.errors.txt
index 0bac30d5b4..85fbf26236 100644
--- a/tests/baselines/reference/contextualTyping21.errors.txt
+++ b/tests/baselines/reference/contextualTyping21.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/compiler/contextualTyping21.ts(1,36): error TS2322: Type '(number | { id: number; })[]' is not assignable to type '{ id: number; }[]'.
-  Type 'number | { id: number; }' is not assignable to type '{ id: number; }'.
-    Type 'number' is not assignable to type '{ id: number; }'.
+tests/cases/compiler/contextualTyping21.ts(1,51): error TS2322: Type 'number' is not assignable to type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping21.ts (1 errors) ====
     var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, 1];
-                                       ~~~
-!!! error TS2322: Type '(number | { id: number; })[]' is not assignable to type '{ id: number; }[]'.
-!!! error TS2322:   Type 'number | { id: number; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Type 'number' is not assignable to type '{ id: number; }'.
\ No newline at end of file
+                                                      ~
+!!! error TS2322: Type 'number' is not assignable to type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping30.errors.txt b/tests/baselines/reference/contextualTyping30.errors.txt
index eda30769ac..43aebc4cd9 100644
--- a/tests/baselines/reference/contextualTyping30.errors.txt
+++ b/tests/baselines/reference/contextualTyping30.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/compiler/contextualTyping30.ts(1,37): error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-  Type 'string | number' is not assignable to type 'number'.
-    Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/contextualTyping30.ts(1,41): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/contextualTyping30.ts (1 errors) ====
     function foo(param:number[]){}; foo([1, "a"]);
-                                        ~~~~~~~~
-!!! error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-!!! error TS2345:   Type 'string | number' is not assignable to type 'number'.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+                                            ~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping33.errors.txt b/tests/baselines/reference/contextualTyping33.errors.txt
index 16c975391a..8dc9b41fab 100644
--- a/tests/baselines/reference/contextualTyping33.errors.txt
+++ b/tests/baselines/reference/contextualTyping33.errors.txt
@@ -1,13 +1,9 @@
-tests/cases/compiler/contextualTyping33.ts(1,66): error TS2345: Argument of type '((() => number) | (() => string))[]' is not assignable to parameter of type '{ (): number; (i: number): number; }[]'.
-  Type '(() => number) | (() => string)' is not assignable to type '{ (): number; (i: number): number; }'.
-    Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
-      Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/contextualTyping33.ts(1,90): error TS2322: Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
+  Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/contextualTyping33.ts (1 errors) ====
     function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return "foo"}]);
-                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '((() => number) | (() => string))[]' is not assignable to parameter of type '{ (): number; (i: number): number; }[]'.
-!!! error TS2345:   Type '(() => number) | (() => string)' is not assignable to type '{ (): number; (i: number): number; }'.
-!!! error TS2345:     Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
-!!! error TS2345:       Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+                                                                                             ~~~~~~~~
+!!! error TS2322: Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
+!!! error TS2322:   Type 'string' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping9.errors.txt b/tests/baselines/reference/contextualTyping9.errors.txt
index 4a12574fa2..05b7df1d06 100644
--- a/tests/baselines/reference/contextualTyping9.errors.txt
+++ b/tests/baselines/reference/contextualTyping9.errors.txt
@@ -1,13 +1,9 @@
-tests/cases/compiler/contextualTyping9.ts(1,42): error TS2322: Type '({ id: number; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-  Type '{ id: number; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-    Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
-      Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
+tests/cases/compiler/contextualTyping9.ts(1,42): error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+  Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping9.ts (1 errors) ====
     var foo:{id:number;}[] = [{id:1}, {id:2, name:"foo"}];
                                              ~~~~~~~~~~
-!!! error TS2322: Type '({ id: number; } | { id: number; name: string; })[]' is not assignable to type '{ id: number; }[]'.
-!!! error TS2322:   Type '{ id: number; } | { id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2322:       Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypingOfArrayLiterals1.errors.txt b/tests/baselines/reference/contextualTypingOfArrayLiterals1.errors.txt
index be73de51f1..4d0bf16589 100644
--- a/tests/baselines/reference/contextualTypingOfArrayLiterals1.errors.txt
+++ b/tests/baselines/reference/contextualTypingOfArrayLiterals1.errors.txt
@@ -1,7 +1,4 @@
-tests/cases/compiler/contextualTypingOfArrayLiterals1.ts(5,5): error TS2322: Type '(number | Date)[]' is not assignable to type 'I'.
-  Index signatures are incompatible.
-    Type 'number | Date' is not assignable to type 'Date'.
-      Type 'number' is not assignable to type 'Date'.
+tests/cases/compiler/contextualTypingOfArrayLiterals1.ts(5,26): error TS2322: Type 'number' is not assignable to type 'Date'.
 
 
 ==== tests/cases/compiler/contextualTypingOfArrayLiterals1.ts (1 errors) ====
@@ -10,11 +7,9 @@ tests/cases/compiler/contextualTypingOfArrayLiterals1.ts(5,5): error TS2322: Typ
     }
     
     var x3: I = [new Date(), 1]; 
-        ~~
-!!! error TS2322: Type '(number | Date)[]' is not assignable to type 'I'.
-!!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'number | Date' is not assignable to type 'Date'.
-!!! error TS2322:       Type 'number' is not assignable to type 'Date'.
+                             ~
+!!! error TS2322: Type 'number' is not assignable to type 'Date'.
+!!! related TS6501 tests/cases/compiler/contextualTypingOfArrayLiterals1.ts:2:4: The expected type comes from this index signature.
     var r2 = x3[1]; 
     r2.getDate(); 
     
\ No newline at end of file
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt
index 1bc381ec39..693a91a1d9 100644
--- a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt
@@ -1,13 +1,8 @@
-tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(4,20): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-  Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(5,23): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-  Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(6,25): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-  Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(11,40): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-  Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(16,23): error TS2322: Type '(arg: string) => number' is not assignable to type '(s: string) => string'.
-  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(4,38): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(5,41): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(6,43): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(11,51): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(16,35): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(21,22): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(26,14): error TS2322: Type '"baz"' is not assignable to type '"foo" | "bar"'.
 
@@ -17,34 +12,33 @@ tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTyp
         show: (x: number) => string;
     }
     function f({ show: showRename = v => v }: Show) {}
-                       ~~~~~~~~~~
-!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+                                         ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6502 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts:2:11: The expected type comes from the return type of this signature.
     function f2({ "show": showRename = v => v }: Show) {}
-                          ~~~~~~~~~~
-!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+                                            ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6502 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts:2:11: The expected type comes from the return type of this signature.
     function f3({ ["show"]: showRename = v => v }: Show) {}
-                            ~~~~~~~~~~
-!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+                                              ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6502 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts:2:11: The expected type comes from the return type of this signature.
     
     interface Nested {
         nested: Show
     }
     function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
-                                           ~~~~
-!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
-!!! related TS6500 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts:2:5: The expected type comes from property 'show' which is declared here on type 'Show'
+                                                      ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6502 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts:2:11: The expected type comes from the return type of this signature.
     
     interface StringIdentity {
         stringIdentity(s: string): string;
     }
     let { stringIdentity: id = arg => arg.length }: StringIdentity = { stringIdentity: x => x};
-                          ~~
-!!! error TS2322: Type '(arg: string) => number' is not assignable to type '(s: string) => string'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+                                      ~~~~~~~~~~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! related TS6502 tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts:14:5: The expected type comes from the return type of this signature.
     
     interface Tuples {
         prop: [string, number];
diff --git a/tests/baselines/reference/deepElaborationsIntoArrowExpressions.errors.txt b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.errors.txt
new file mode 100644
index 0000000000..abaee6d680
--- /dev/null
+++ b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.errors.txt
@@ -0,0 +1,37 @@
+tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts(4,14): error TS2322: Type '"b"' is not assignable to type '"a"'.
+tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts(12,20): error TS2322: Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts(16,14): error TS2322: Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts(18,18): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts (4 errors) ====
+    const a: {
+        y(): "a"
+    } = {
+        y: () => "b"
+                 ~~~
+!!! error TS2322: Type '"b"' is not assignable to type '"a"'.
+!!! related TS6502 tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts:2:5: The expected type comes from the return type of this signature.
+    };
+    
+    interface Foo {
+        a: number;
+    }
+    
+    function foo1(): () => Foo {
+        return () => ({a: ''});
+                       ~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+!!! related TS6500 tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts:8:5: The expected type comes from property 'a' which is declared here on type 'Foo'
+    }
+    
+    function foo3(): Foo[] {
+        return [{a: ''}];
+                 ~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+!!! related TS6500 tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts:8:5: The expected type comes from property 'a' which is declared here on type 'Foo'
+    }
+    var y: Foo[] = [{a: ''}]
+                     ~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+!!! related TS6500 tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts:8:5: The expected type comes from property 'a' which is declared here on type 'Foo'
\ No newline at end of file
diff --git a/tests/baselines/reference/deepElaborationsIntoArrowExpressions.js b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.js
new file mode 100644
index 0000000000..c460f56ed7
--- /dev/null
+++ b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.js
@@ -0,0 +1,31 @@
+//// [deepElaborationsIntoArrowExpressions.ts]
+const a: {
+    y(): "a"
+} = {
+    y: () => "b"
+};
+
+interface Foo {
+    a: number;
+}
+
+function foo1(): () => Foo {
+    return () => ({a: ''});
+}
+
+function foo3(): Foo[] {
+    return [{a: ''}];
+}
+var y: Foo[] = [{a: ''}]
+
+//// [deepElaborationsIntoArrowExpressions.js]
+const a = {
+    y: () => "b"
+};
+function foo1() {
+    return () => ({ a: '' });
+}
+function foo3() {
+    return [{ a: '' }];
+}
+var y = [{ a: '' }];
diff --git a/tests/baselines/reference/deepElaborationsIntoArrowExpressions.symbols b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.symbols
new file mode 100644
index 0000000000..f7c07ced17
--- /dev/null
+++ b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.symbols
@@ -0,0 +1,40 @@
+=== tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts ===
+const a: {
+>a : Symbol(a, Decl(deepElaborationsIntoArrowExpressions.ts, 0, 5))
+
+    y(): "a"
+>y : Symbol(y, Decl(deepElaborationsIntoArrowExpressions.ts, 0, 10))
+
+} = {
+    y: () => "b"
+>y : Symbol(y, Decl(deepElaborationsIntoArrowExpressions.ts, 2, 5))
+
+};
+
+interface Foo {
+>Foo : Symbol(Foo, Decl(deepElaborationsIntoArrowExpressions.ts, 4, 2))
+
+    a: number;
+>a : Symbol(Foo.a, Decl(deepElaborationsIntoArrowExpressions.ts, 6, 15))
+}
+
+function foo1(): () => Foo {
+>foo1 : Symbol(foo1, Decl(deepElaborationsIntoArrowExpressions.ts, 8, 1))
+>Foo : Symbol(Foo, Decl(deepElaborationsIntoArrowExpressions.ts, 4, 2))
+
+    return () => ({a: ''});
+>a : Symbol(a, Decl(deepElaborationsIntoArrowExpressions.ts, 11, 19))
+}
+
+function foo3(): Foo[] {
+>foo3 : Symbol(foo3, Decl(deepElaborationsIntoArrowExpressions.ts, 12, 1))
+>Foo : Symbol(Foo, Decl(deepElaborationsIntoArrowExpressions.ts, 4, 2))
+
+    return [{a: ''}];
+>a : Symbol(a, Decl(deepElaborationsIntoArrowExpressions.ts, 15, 13))
+}
+var y: Foo[] = [{a: ''}]
+>y : Symbol(y, Decl(deepElaborationsIntoArrowExpressions.ts, 17, 3))
+>Foo : Symbol(Foo, Decl(deepElaborationsIntoArrowExpressions.ts, 4, 2))
+>a : Symbol(a, Decl(deepElaborationsIntoArrowExpressions.ts, 17, 17))
+
diff --git a/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types
new file mode 100644
index 0000000000..2af9c1e978
--- /dev/null
+++ b/tests/baselines/reference/deepElaborationsIntoArrowExpressions.types
@@ -0,0 +1,49 @@
+=== tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts ===
+const a: {
+>a : { y(): "a"; }
+
+    y(): "a"
+>y : () => "a"
+
+} = {
+>{    y: () => "b"} : { y: () => "b"; }
+
+    y: () => "b"
+>y : () => "b"
+>() => "b" : () => "b"
+>"b" : "b"
+
+};
+
+interface Foo {
+    a: number;
+>a : number
+}
+
+function foo1(): () => Foo {
+>foo1 : () => () => Foo
+
+    return () => ({a: ''});
+>() => ({a: ''}) : () => { a: string; }
+>({a: ''}) : { a: string; }
+>{a: ''} : { a: string; }
+>a : string
+>'' : ""
+}
+
+function foo3(): Foo[] {
+>foo3 : () => Foo[]
+
+    return [{a: ''}];
+>[{a: ''}] : { a: string; }[]
+>{a: ''} : { a: string; }
+>a : string
+>'' : ""
+}
+var y: Foo[] = [{a: ''}]
+>y : Foo[]
+>[{a: ''}] : { a: string; }[]
+>{a: ''} : { a: string; }
+>a : string
+>'' : ""
+
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
index 46e4f597c2..d970223cb1 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
@@ -5,9 +5,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(22,11): error TS2322: Type 'string' is not assignable to type '[[any]]'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(23,4): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]]]'.
   Property '2' is missing in type '[number, number]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(24,4): error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-  Type 'string | number' is not assignable to type 'number'.
-    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(24,11): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(29,17): error TS1317: A parameter property cannot be declared using a rest parameter.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(34,22): error TS2304: Cannot find name 'E1'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(34,28): error TS2304: Cannot find name 'E'.
@@ -52,10 +50,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 !!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]]]'.
 !!! error TS2345:   Property '2' is missing in type '[number, number]'.
     a6([1, 2, "string"]);                   // Error, parameter type is number[]
-       ~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-!!! error TS2345:   Type 'string | number' is not assignable to type 'number'.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+              ~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
     
     
     var temp = [1, 2, 3];
diff --git a/tests/baselines/reference/destructuringVariableDeclaration2.errors.txt b/tests/baselines/reference/destructuringVariableDeclaration2.errors.txt
index 104c95bc42..2ea3149f2e 100644
--- a/tests/baselines/reference/destructuringVariableDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringVariableDeclaration2.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts(3,46): error TS2322: Type 'true' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts(3,56): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts(4,61): error TS2322: Type 'false' is not assignable to type 'string'.
-tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts(19,10): error TS2322: Type 'string[]' is not assignable to type 'number[]'.
-  Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts(19,16): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts (4 errors) ====
@@ -33,6 +32,5 @@ tests/cases/conformance/es6/destructuring/destructuringVariableDeclaration2.ts(1
     // an initializer expression, the type of the initializer expression is required to be assignable
     // to the widened form of the type associated with the destructuring variable declaration, binding property, or binding element.
     var {d: {d1 = ["string", null]}}: { d: { d1: number[] } } = { d: { d1: [1, 2] } };  // Error
-             ~~
-!!! error TS2322: Type 'string[]' is not assignable to type 'number[]'.
-!!! error TS2322:   Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+                   ~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
index 0da83390f8..81a3ceab8e 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
@@ -18,8 +18,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(47,5): error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: string) => number'.
   Types of parameters 'x' and 'x' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(48,5): error TS2322: Type '(x: string) => string' is not assignable to type '(x: string) => number'.
-  Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(48,32): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(50,5): error TS2322: Type 'typeof N' is not assignable to type 'typeof M'.
   Types of property 'A' are incompatible.
     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
@@ -111,9 +110,9 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var aLambda: typeof F = (x) => 'a string';
-        ~~~~~~~
-!!! error TS2322: Type '(x: string) => string' is not assignable to type '(x: string) => number'.
-!!! error TS2322:   Type 'string' is not assignable to type 'number'.
+                                   ~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+!!! related TS6502 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts:15:10: The expected type comes from the return type of this signature.
     
     var aModule: typeof M = N;
         ~~~~~~~
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
index 900d605d5f..d295f83660 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,27): error TS2345: Argument of type '(d: Derived) => Base' is not assignable to parameter of type '(p: Derived) => Derived'.
-  Type 'Base' is not assignable to type 'Derived'.
-    Property 'toBase' is missing in type 'Base'.
+tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Type 'Base' is not assignable to type 'Derived'.
+  Property 'toBase' is missing in type 'Base'.
 
 
 ==== tests/cases/compiler/fixingTypeParametersRepeatedly2.ts (1 errors) ====
@@ -15,10 +14,10 @@ tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,27): error TS2345: Ar
     
     declare function foo<T>(x: T, func: (p: T) => T): T;
     var result = foo(derived, d => d.toBase());
-                              ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(d: Derived) => Base' is not assignable to parameter of type '(p: Derived) => Derived'.
-!!! error TS2345:   Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2345:     Property 'toBase' is missing in type 'Base'.
+                                   ~~~~~~~~~~
+!!! error TS2322: Type 'Base' is not assignable to type 'Derived'.
+!!! error TS2322:   Property 'toBase' is missing in type 'Base'.
+!!! related TS6502 tests/cases/compiler/fixingTypeParametersRepeatedly2.ts:10:37: The expected type comes from the return type of this signature.
     
     // bar should type check just like foo.
     // The same error should be observed in both cases.
diff --git a/tests/baselines/reference/for-of10.errors.txt b/tests/baselines/reference/for-of10.errors.txt
index 1636f1a02d..724b02dce6 100644
--- a/tests/baselines/reference/for-of10.errors.txt
+++ b/tests/baselines/reference/for-of10.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/for-ofStatements/for-of10.ts(2,6): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/es6/for-ofStatements/for-of10.ts(2,12): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/es6/for-ofStatements/for-of10.ts (1 errors) ====
     var v: string;
     for (v of [0]) { }
-         ~
+               ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/for-of11.errors.txt b/tests/baselines/reference/for-of11.errors.txt
index dc527e73ef..9872108143 100644
--- a/tests/baselines/reference/for-of11.errors.txt
+++ b/tests/baselines/reference/for-of11.errors.txt
@@ -1,10 +1,8 @@
-tests/cases/conformance/es6/for-ofStatements/for-of11.ts(2,6): error TS2322: Type 'string | number' is not assignable to type 'string'.
-  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/es6/for-ofStatements/for-of11.ts(2,12): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/es6/for-ofStatements/for-of11.ts (1 errors) ====
     var v: string;
     for (v of [0, ""]) { }
-         ~
-!!! error TS2322: Type 'string | number' is not assignable to type 'string'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
\ No newline at end of file
+               ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/for-of39.errors.txt b/tests/baselines/reference/for-of39.errors.txt
index 5f08496183..fedf9f3e34 100644
--- a/tests/baselines/reference/for-of39.errors.txt
+++ b/tests/baselines/reference/for-of39.errors.txt
@@ -1,16 +1,10 @@
-tests/cases/conformance/es6/for-ofStatements/for-of39.ts(1,19): error TS2345: Argument of type '([string, number] | [string, true])[]' is not assignable to parameter of type 'ReadonlyArray<[string, boolean]>'.
-  Type '[string, number] | [string, true]' is not assignable to type '[string, boolean]'.
-    Type '[string, number]' is not assignable to type '[string, boolean]'.
-      Type 'number' is not assignable to type 'boolean'.
+tests/cases/conformance/es6/for-ofStatements/for-of39.ts(1,37): error TS2322: Type 'number' is not assignable to type 'boolean'.
 
 
 ==== tests/cases/conformance/es6/for-ofStatements/for-of39.ts (1 errors) ====
     var map = new Map([["", true], ["", 0]]);
-                      ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '([string, number] | [string, true])[]' is not assignable to parameter of type 'ReadonlyArray<[string, boolean]>'.
-!!! error TS2345:   Type '[string, number] | [string, true]' is not assignable to type '[string, boolean]'.
-!!! error TS2345:     Type '[string, number]' is not assignable to type '[string, boolean]'.
-!!! error TS2345:       Type 'number' is not assignable to type 'boolean'.
+                                        ~
+!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
     for (var [k, v] of map) {
         k;
         v;
diff --git a/tests/baselines/reference/functionOverloads40.errors.txt b/tests/baselines/reference/functionOverloads40.errors.txt
index f965a4eb9e..f053c7c620 100644
--- a/tests/baselines/reference/functionOverloads40.errors.txt
+++ b/tests/baselines/reference/functionOverloads40.errors.txt
@@ -1,7 +1,4 @@
-tests/cases/compiler/functionOverloads40.ts(4,13): error TS2345: Argument of type '{ a: string; }[]' is not assignable to parameter of type '{ a: boolean; }[]'.
-  Type '{ a: string; }' is not assignable to type '{ a: boolean; }'.
-    Types of property 'a' are incompatible.
-      Type 'string' is not assignable to type 'boolean'.
+tests/cases/compiler/functionOverloads40.ts(4,15): error TS2322: Type 'string' is not assignable to type 'boolean'.
 
 
 ==== tests/cases/compiler/functionOverloads40.ts (1 errors) ====
@@ -9,9 +6,7 @@ tests/cases/compiler/functionOverloads40.ts(4,13): error TS2345: Argument of typ
     function foo(bar:{a:boolean;}[]):number;
     function foo(bar:{a:any;}[]):any{ return bar }
     var x = foo([{a:'bar'}]);
-                ~~~~~~~~~~~
-!!! error TS2345: Argument of type '{ a: string; }[]' is not assignable to parameter of type '{ a: boolean; }[]'.
-!!! error TS2345:   Type '{ a: string; }' is not assignable to type '{ a: boolean; }'.
-!!! error TS2345:     Types of property 'a' are incompatible.
-!!! error TS2345:       Type 'string' is not assignable to type 'boolean'.
+                  ~
+!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
+!!! related TS6500 tests/cases/compiler/functionOverloads40.ts:2:19: The expected type comes from property 'a' which is declared here on type '{ a: boolean; }'
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads41.errors.txt b/tests/baselines/reference/functionOverloads41.errors.txt
index 77f8149c82..a3d924f15b 100644
--- a/tests/baselines/reference/functionOverloads41.errors.txt
+++ b/tests/baselines/reference/functionOverloads41.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/functionOverloads41.ts(4,13): error TS2345: Argument of type '{}[]' is not assignable to parameter of type '{ a: boolean; }[]'.
-  Type '{}' is not assignable to type '{ a: boolean; }'.
-    Property 'a' is missing in type '{}'.
+tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
+  Property 'a' is missing in type '{}'.
 
 
 ==== tests/cases/compiler/functionOverloads41.ts (1 errors) ====
@@ -8,8 +7,7 @@ tests/cases/compiler/functionOverloads41.ts(4,13): error TS2345: Argument of typ
     function foo(bar:{a:boolean;}[]):number;
     function foo(bar:{a:any;}[]):any{ return bar }
     var x = foo([{}]);
-                ~~~~
-!!! error TS2345: Argument of type '{}[]' is not assignable to parameter of type '{ a: boolean; }[]'.
-!!! error TS2345:   Type '{}' is not assignable to type '{ a: boolean; }'.
-!!! error TS2345:     Property 'a' is missing in type '{}'.
+                 ~~
+!!! error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
+!!! error TS2322:   Property 'a' is missing in type '{}'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
index 363f0b0f64..a66672f515 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
@@ -6,8 +6,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(25,23): error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
   Types of parameters 'a' and 'x' are incompatible.
     Type 'Date' is not assignable to type 'T'.
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(37,36): error TS2345: Argument of type '(x: E) => F' is not assignable to parameter of type '(x: E) => E'.
-  Type 'F' is not assignable to type 'E'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(37,43): error TS2322: Type 'F' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(50,21): error TS2345: Argument of type 'Date' is not assignable to parameter of type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(51,22): error TS2345: Argument of type '1' is not assignable to parameter of type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(60,23): error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
@@ -67,9 +66,9 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
         }
     
         var r7 = foo3(E.A, (x) => E.A, (x) => F.A); // error
-                                       ~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: E) => F' is not assignable to parameter of type '(x: E) => E'.
-!!! error TS2345:   Type 'F' is not assignable to type 'E'.
+                                              ~~~
+!!! error TS2322: Type 'F' is not assignable to type 'E'.
+!!! related TS6502 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts:32:47: The expected type comes from the return type of this signature.
     }
     
     module TU {
diff --git a/tests/baselines/reference/heterogeneousArrayAndOverloads.errors.txt b/tests/baselines/reference/heterogeneousArrayAndOverloads.errors.txt
index e5c2be7a59..60228b956f 100644
--- a/tests/baselines/reference/heterogeneousArrayAndOverloads.errors.txt
+++ b/tests/baselines/reference/heterogeneousArrayAndOverloads.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/heterogeneousArrayAndOverloads.ts(9,19): error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'string[]'.
-  Type 'string | number' is not assignable to type 'string'.
-    Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/heterogeneousArrayAndOverloads.ts(9,20): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/heterogeneousArrayAndOverloads.ts(9,23): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/heterogeneousArrayAndOverloads.ts(9,32): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/compiler/heterogeneousArrayAndOverloads.ts (1 errors) ====
+==== tests/cases/compiler/heterogeneousArrayAndOverloads.ts (3 errors) ====
     class arrTest {
         test(arg1: number[]);
         test(arg1: string[]);
@@ -13,9 +13,11 @@ tests/cases/compiler/heterogeneousArrayAndOverloads.ts(9,19): error TS2345: Argu
             this.test(["hi"]);
             this.test([]);
             this.test([1, 2, "hi", 5]); // Error
-                      ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'string[]'.
-!!! error TS2345:   Type 'string | number' is not assignable to type 'string'.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+                       ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+                          ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+                                   ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern28.errors.txt b/tests/baselines/reference/iterableArrayPattern28.errors.txt
index ecc9f0a02c..26ce99e048 100644
--- a/tests/baselines/reference/iterableArrayPattern28.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern28.errors.txt
@@ -1,8 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern28.ts(1,33): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern28.ts(2,32): error TS2345: Argument of type '([string, number] | [string, boolean])[]' is not assignable to parameter of type 'ReadonlyArray<[string, number]>'.
-  Type '[string, number] | [string, boolean]' is not assignable to type '[string, number]'.
-    Type '[string, boolean]' is not assignable to type '[string, number]'.
-      Type 'boolean' is not assignable to type 'number'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern28.ts(2,52): error TS2322: Type 'true' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern28.ts (2 errors) ====
@@ -10,8 +7,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern28.ts(2,32): error
                                     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2501: A rest element cannot contain a binding pattern.
     takeFirstTwoEntries(...new Map([["", 0], ["hello", true]]));
-                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '([string, number] | [string, boolean])[]' is not assignable to parameter of type 'ReadonlyArray<[string, number]>'.
-!!! error TS2345:   Type '[string, number] | [string, boolean]' is not assignable to type '[string, number]'.
-!!! error TS2345:     Type '[string, boolean]' is not assignable to type '[string, number]'.
-!!! error TS2345:       Type 'boolean' is not assignable to type 'number'.
\ No newline at end of file
+                                                       ~~~~
+!!! error TS2322: Type 'true' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/iteratorSpreadInArray5.errors.txt b/tests/baselines/reference/iteratorSpreadInArray5.errors.txt
index 02049824c4..9d8b980d0b 100644
--- a/tests/baselines/reference/iteratorSpreadInArray5.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInArray5.errors.txt
@@ -1,6 +1,4 @@
-tests/cases/conformance/es6/spread/iteratorSpreadInArray5.ts(14,5): error TS2322: Type '(number | symbol)[]' is not assignable to type 'number[]'.
-  Type 'number | symbol' is not assignable to type 'number'.
-    Type 'symbol' is not assignable to type 'number'.
+tests/cases/conformance/es6/spread/iteratorSpreadInArray5.ts(14,30): error TS2322: Type 'symbol' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/es6/spread/iteratorSpreadInArray5.ts (1 errors) ====
@@ -18,7 +16,5 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray5.ts(14,5): error TS2322
     }
     
     var array: number[] = [0, 1, ...new SymbolIterator];
-        ~~~~~
-!!! error TS2322: Type '(number | symbol)[]' is not assignable to type 'number[]'.
-!!! error TS2322:   Type 'number | symbol' is not assignable to type 'number'.
-!!! error TS2322:     Type 'symbol' is not assignable to type 'number'.
\ No newline at end of file
+                                 ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'symbol' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxChildrenGenericContextualTypes.errors.txt b/tests/baselines/reference/jsxChildrenGenericContextualTypes.errors.txt
index f9e193d104..68837c6e1f 100644
--- a/tests/baselines/reference/jsxChildrenGenericContextualTypes.errors.txt
+++ b/tests/baselines/reference/jsxChildrenGenericContextualTypes.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(20,31): error TS2322: Type '(p: LitProps<"x">) => "y"' is not assignable to type '(x: IntrinsicAttributes & LitProps<"x">) => "x"'.
-  Type '"y"' is not assignable to type '"x"'.
+tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(20,46): error TS2322: Type '"y"' is not assignable to type '"x"'.
 tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(21,19): error TS2322: Type '{ children: (p: IntrinsicAttributes & LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x" | "y">'.
   Type '{ children: (p: IntrinsicAttributes & LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'LitProps<"x" | "y">'.
     Types of property 'children' are incompatible.
@@ -38,10 +37,9 @@ tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(22,21): error TS2322:
     
     // Should error
     const arg = <ElemLit prop="x" children={p => "y"} />
-                                  ~~~~~~~~
-!!! error TS2322: Type '(p: LitProps<"x">) => "y"' is not assignable to type '(x: IntrinsicAttributes & LitProps<"x">) => "x"'.
-!!! error TS2322:   Type '"y"' is not assignable to type '"x"'.
-!!! related TS6500 tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx:13:34: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & LitProps<"x">'
+                                                 ~~~
+!!! error TS2322: Type '"y"' is not assignable to type '"x"'.
+!!! related TS6502 tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx:13:44: The expected type comes from the return type of this signature.
     const argchild = <ElemLit prop="x">{p => "y"}</ElemLit>
                       ~~~~~~~
 !!! error TS2322: Type '{ children: (p: IntrinsicAttributes & LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x" | "y">'.
diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt b/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
index b578d002e0..92f3d403d0 100644
--- a/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/keyofIsLiteralContexualType.ts(5,9): error TS2322: Type '("a" | "b" | "c")[]' is not assignable to type '(keyof T)[]'.
-  Type '"a" | "b" | "c"' is not assignable to type 'keyof T'.
-    Type '"c"' is not assignable to type 'keyof T'.
-      Type '"c"' is not assignable to type '"a" | "b"'.
+tests/cases/compiler/keyofIsLiteralContexualType.ts(5,37): error TS2322: Type '"c"' is not assignable to type 'keyof T'.
+  Type '"c"' is not assignable to type '"a" | "b"'.
 tests/cases/compiler/keyofIsLiteralContexualType.ts(13,11): error TS2339: Property 'b' does not exist on type 'Pick<{ a: number; b: number; c: number; }, "a" | "c">'.
 
 
@@ -11,11 +9,9 @@ tests/cases/compiler/keyofIsLiteralContexualType.ts(13,11): error TS2339: Proper
     function foo<T extends { a: string, b: string }>() {
         let a: (keyof T)[] = ["a", "b"];
         let b: (keyof T)[] = ["a", "b", "c"];
-            ~
-!!! error TS2322: Type '("a" | "b" | "c")[]' is not assignable to type '(keyof T)[]'.
-!!! error TS2322:   Type '"a" | "b" | "c"' is not assignable to type 'keyof T'.
-!!! error TS2322:     Type '"c"' is not assignable to type 'keyof T'.
-!!! error TS2322:       Type '"c"' is not assignable to type '"a" | "b"'.
+                                        ~~~
+!!! error TS2322: Type '"c"' is not assignable to type 'keyof T'.
+!!! error TS2322:   Type '"c"' is not assignable to type '"a" | "b"'.
     }
     
     // Repro from #12455
diff --git a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.errors.txt b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.errors.txt
index f96dc69ee3..1dace59f72 100644
--- a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.errors.txt
+++ b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.errors.txt
@@ -1,6 +1,4 @@
-tests/cases/compiler/mismatchedExplicitTypeParameterAndArgumentType.ts(10,30): error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-  Type 'string | number' is not assignable to type 'number'.
-    Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/mismatchedExplicitTypeParameterAndArgumentType.ts(10,34): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/mismatchedExplicitTypeParameterAndArgumentType.ts(11,15): error TS2558: Expected 2 type arguments, but got 1.
 
 
@@ -15,10 +13,8 @@ tests/cases/compiler/mismatchedExplicitTypeParameterAndArgumentType.ts(11,15): e
     var r5 = map<any, any>([1, ""], (x) => x.toString());
     var r6 = map<Object, Object>([1, ""], (x) => x.toString());
     var r7 = map<number, string>([1, ""], (x) => x.toString()); // error
-                                 ~~~~~~~
-!!! error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-!!! error TS2345:   Type 'string | number' is not assignable to type 'number'.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+                                     ~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
     var r7b = map<number>([1, ""], (x) => x.toString()); // error
                   ~~~~~~
 !!! error TS2558: Expected 2 type arguments, but got 1.
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
index 9fa7176779..3c3d292216 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
@@ -32,12 +32,9 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(13,17): error
     f2({ toString: (s) => s }) 
          ~~~~~~~~
 !!! error TS2322: Type '(s: any) => any' is not assignable to type '() => string'.
-!!! related TS6500 /.ts/lib.es5.d.ts:125:5: The expected type comes from property 'toString' which is declared here on type 'I2'
     f2({ toString: (s: string) => s }) 
          ~~~~~~~~
 !!! error TS2322: Type '(s: string) => string' is not assignable to type '() => string'.
-!!! related TS6500 /.ts/lib.es5.d.ts:125:5: The expected type comes from property 'toString' which is declared here on type 'I2'
     f2({ value: '', toString: (s) => s.uhhh }) 
                     ~~~~~~~~
-!!! error TS2322: Type '(s: any) => any' is not assignable to type '() => string'.
-!!! related TS6500 /.ts/lib.es5.d.ts:125:5: The expected type comes from property 'toString' which is declared here on type 'I2'
\ No newline at end of file
+!!! error TS2322: Type '(s: any) => any' is not assignable to type '() => string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.errors.txt b/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.errors.txt
index 13cc52dd2c..5260d6a8da 100644
--- a/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.errors.txt
+++ b/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.errors.txt
@@ -1,10 +1,7 @@
-tests/cases/compiler/objectLiteralsAgainstUnionsOfArrays01.ts(9,5): error TS2322: Type '{ bar: { prop: number; }; }[]' is not assignable to type 'Foo[]'.
-  Type '{ bar: { prop: number; }; }' is not assignable to type 'Foo'.
-    Types of property 'bar' are incompatible.
-      Type '{ prop: number; }' is not assignable to type 'Bar | Bar[]'.
-        Type '{ prop: number; }' is not assignable to type 'Bar'.
-          Types of property 'prop' are incompatible.
-            Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/objectLiteralsAgainstUnionsOfArrays01.ts(10,5): error TS2322: Type '{ prop: number; }' is not assignable to type 'Bar | Bar[]'.
+  Type '{ prop: number; }' is not assignable to type 'Bar'.
+    Types of property 'prop' are incompatible.
+      Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/objectLiteralsAgainstUnionsOfArrays01.ts (1 errors) ====
@@ -17,14 +14,12 @@ tests/cases/compiler/objectLiteralsAgainstUnionsOfArrays01.ts(9,5): error TS2322
     }
     
     let x: Foo[] = [
-        ~
-!!! error TS2322: Type '{ bar: { prop: number; }; }[]' is not assignable to type 'Foo[]'.
-!!! error TS2322:   Type '{ bar: { prop: number; }; }' is not assignable to type 'Foo'.
-!!! error TS2322:     Types of property 'bar' are incompatible.
-!!! error TS2322:       Type '{ prop: number; }' is not assignable to type 'Bar | Bar[]'.
-!!! error TS2322:         Type '{ prop: number; }' is not assignable to type 'Bar'.
-!!! error TS2322:           Types of property 'prop' are incompatible.
-!!! error TS2322:             Type 'number' is not assignable to type 'string'.
       { bar: { prop: 100 } }
+        ~~~
+!!! error TS2322: Type '{ prop: number; }' is not assignable to type 'Bar | Bar[]'.
+!!! error TS2322:   Type '{ prop: number; }' is not assignable to type 'Bar'.
+!!! error TS2322:     Types of property 'prop' are incompatible.
+!!! error TS2322:       Type 'number' is not assignable to type 'string'.
+!!! related TS6500 tests/cases/compiler/objectLiteralsAgainstUnionsOfArrays01.ts:2:3: The expected type comes from property 'bar' which is declared here on type 'Foo'
     ]
     
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadResolutionOverCTLambda.errors.txt b/tests/baselines/reference/overloadResolutionOverCTLambda.errors.txt
index 9fc11b681c..c76eae5908 100644
--- a/tests/baselines/reference/overloadResolutionOverCTLambda.errors.txt
+++ b/tests/baselines/reference/overloadResolutionOverCTLambda.errors.txt
@@ -1,10 +1,9 @@
-tests/cases/compiler/overloadResolutionOverCTLambda.ts(2,5): error TS2345: Argument of type '(a: number) => number' is not assignable to parameter of type '(item: number) => boolean'.
-  Type 'number' is not assignable to type 'boolean'.
+tests/cases/compiler/overloadResolutionOverCTLambda.ts(2,10): error TS2322: Type 'number' is not assignable to type 'boolean'.
 
 
 ==== tests/cases/compiler/overloadResolutionOverCTLambda.ts (1 errors) ====
     function foo(b: (item: number) => boolean) { }
     foo(a => a); // can not convert (number)=>bool to (number)=>number
-        ~~~~~~
-!!! error TS2345: Argument of type '(a: number) => number' is not assignable to parameter of type '(item: number) => boolean'.
-!!! error TS2345:   Type 'number' is not assignable to type 'boolean'.
\ No newline at end of file
+             ~
+!!! error TS2322: Type 'number' is not assignable to type 'boolean'.
+!!! related TS6502 tests/cases/compiler/overloadResolutionOverCTLambda.ts:1:17: The expected type comes from the return type of this signature.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadResolutionTest1.errors.txt b/tests/baselines/reference/overloadResolutionTest1.errors.txt
index 53ee787347..008ee13127 100644
--- a/tests/baselines/reference/overloadResolutionTest1.errors.txt
+++ b/tests/baselines/reference/overloadResolutionTest1.errors.txt
@@ -1,7 +1,4 @@
-tests/cases/compiler/overloadResolutionTest1.ts(7,16): error TS2345: Argument of type '{ a: string; }[]' is not assignable to parameter of type '{ a: boolean; }[]'.
-  Type '{ a: string; }' is not assignable to type '{ a: boolean; }'.
-    Types of property 'a' are incompatible.
-      Type 'string' is not assignable to type 'boolean'.
+tests/cases/compiler/overloadResolutionTest1.ts(7,18): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/compiler/overloadResolutionTest1.ts(18,16): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/compiler/overloadResolutionTest1.ts(24,15): error TS2322: Type 'true' is not assignable to type 'string'.
 
@@ -14,11 +11,9 @@ tests/cases/compiler/overloadResolutionTest1.ts(24,15): error TS2322: Type 'true
     var x1 = foo([{a:true}]); // works
     var x11 = foo([{a:0}]); // works
     var x111 = foo([{a:"s"}]); // error - does not match any signature
-                   ~~~~~~~~~
-!!! error TS2345: Argument of type '{ a: string; }[]' is not assignable to parameter of type '{ a: boolean; }[]'.
-!!! error TS2345:   Type '{ a: string; }' is not assignable to type '{ a: boolean; }'.
-!!! error TS2345:     Types of property 'a' are incompatible.
-!!! error TS2345:       Type 'string' is not assignable to type 'boolean'.
+                     ~
+!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
+!!! related TS6500 tests/cases/compiler/overloadResolutionTest1.ts:2:19: The expected type comes from property 'a' which is declared here on type '{ a: boolean; }'
     var x1111 = foo([{a:null}]); // works - ambiguous call is resolved to be the first in the overload set so this returns a string
     
     
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
index daf057c9eb..aa247f0bd9 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -1,10 +1,8 @@
-tests/cases/compiler/overloadsWithProvisionalErrors.ts(6,6): error TS2345: Argument of type '(s: string) => {}' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
-  Type '{}' is not assignable to type '{ a: number; b: number; }'.
-    Property 'a' is missing in type '{}'.
+tests/cases/compiler/overloadsWithProvisionalErrors.ts(6,11): error TS2322: Type '{}' is not assignable to type '{ a: number; b: number; }'.
+  Property 'a' is missing in type '{}'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(7,17): error TS2304: Cannot find name 'blah'.
-tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,6): error TS2345: Argument of type '(s: string) => { a: any; }' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
-  Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
-    Property 'b' is missing in type '{ a: any; }'.
+tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,11): error TS2322: Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
+  Property 'b' is missing in type '{ a: any; }'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'.
 
 
@@ -15,17 +13,17 @@ tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cann
     };
     
     func(s => ({})); // Error for no applicable overload (object type is missing a and b)
-         ~~~~~~~~~
-!!! error TS2345: Argument of type '(s: string) => {}' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
-!!! error TS2345:   Type '{}' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2345:     Property 'a' is missing in type '{}'.
+              ~~~~
+!!! error TS2322: Type '{}' is not assignable to type '{ a: number; b: number; }'.
+!!! error TS2322:   Property 'a' is missing in type '{}'.
+!!! related TS6502 tests/cases/compiler/overloadsWithProvisionalErrors.ts:3:14: The expected type comes from the return type of this signature.
     func(s => ({ a: blah, b: 3 })); // Only error inside the function, but not outside (since it would be applicable if not for the provisional error)
                     ~~~~
 !!! error TS2304: Cannot find name 'blah'.
     func(s => ({ a: blah })); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway
-         ~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(s: string) => { a: any; }' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
-!!! error TS2345:   Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2345:     Property 'b' is missing in type '{ a: any; }'.
+              ~~~~~~~~~~~~~
+!!! error TS2322: Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: any; }'.
+!!! related TS6502 tests/cases/compiler/overloadsWithProvisionalErrors.ts:3:14: The expected type comes from the return type of this signature.
                     ~~~~
 !!! error TS2304: Cannot find name 'blah'.
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining1.errors.txt b/tests/baselines/reference/promiseChaining1.errors.txt
index 7396d03059..95f421b36f 100644
--- a/tests/baselines/reference/promiseChaining1.errors.txt
+++ b/tests/baselines/reference/promiseChaining1.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/promiseChaining1.ts(7,50): error TS2345: Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
-  Type 'string' is not assignable to type 'Function'.
+tests/cases/compiler/promiseChaining1.ts(7,55): error TS2322: Type 'string' is not assignable to type 'Function'.
 
 
 ==== tests/cases/compiler/promiseChaining1.ts (1 errors) ====
@@ -10,9 +9,9 @@ tests/cases/compiler/promiseChaining1.ts(7,50): error TS2345: Argument of type '
             var result = cb(this.value);
             // should get a fresh type parameter which each then call
             var z = this.then(x => result)/*S*/.then(x => "abc")/*Function*/.then(x => x.length)/*number*/; // Should error on "abc" because it is not a Function
-                                                     ~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
-!!! error TS2345:   Type 'string' is not assignable to type 'Function'.
+                                                          ~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'Function'.
+!!! related TS6502 tests/cases/compiler/promiseChaining1.ts:4:34: The expected type comes from the return type of this signature.
             return new Chain2(result);
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining2.errors.txt b/tests/baselines/reference/promiseChaining2.errors.txt
index a31c4335da..f7326ec8cb 100644
--- a/tests/baselines/reference/promiseChaining2.errors.txt
+++ b/tests/baselines/reference/promiseChaining2.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/promiseChaining2.ts(7,45): error TS2345: Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
-  Type 'string' is not assignable to type 'Function'.
+tests/cases/compiler/promiseChaining2.ts(7,50): error TS2322: Type 'string' is not assignable to type 'Function'.
 
 
 ==== tests/cases/compiler/promiseChaining2.ts (1 errors) ====
@@ -10,9 +9,9 @@ tests/cases/compiler/promiseChaining2.ts(7,45): error TS2345: Argument of type '
             var result = cb(this.value);
             // should get a fresh type parameter which each then call
             var z = this.then(x => result).then(x => "abc").then(x => x.length);
-                                                ~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
-!!! error TS2345:   Type 'string' is not assignable to type 'Function'.
+                                                     ~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'Function'.
+!!! related TS6502 tests/cases/compiler/promiseChaining2.ts:4:34: The expected type comes from the return type of this signature.
             return new Chain2(result);
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseTypeInference.errors.txt b/tests/baselines/reference/promiseTypeInference.errors.txt
index fab56c7337..0ae42f3cbb 100644
--- a/tests/baselines/reference/promiseTypeInference.errors.txt
+++ b/tests/baselines/reference/promiseTypeInference.errors.txt
@@ -1,11 +1,10 @@
-tests/cases/compiler/promiseTypeInference.ts(10,34): error TS2345: Argument of type '(s: string) => IPromise<number>' is not assignable to parameter of type '(value: string) => number | PromiseLike<number>'.
-  Type 'IPromise<number>' is not assignable to type 'number | PromiseLike<number>'.
-    Type 'IPromise<number>' is not assignable to type 'PromiseLike<number>'.
-      Types of property 'then' are incompatible.
-        Type '<U>(success?: (value: number) => IPromise<U>) => IPromise<U>' is not assignable to type '<TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => PromiseLike<TResult1 | TResult2>'.
-          Types of parameters 'success' and 'onfulfilled' are incompatible.
-            Type 'TResult1 | PromiseLike<TResult1>' is not assignable to type 'IPromise<TResult1 | TResult2>'.
-              Type 'TResult1' is not assignable to type 'IPromise<TResult1 | TResult2>'.
+tests/cases/compiler/promiseTypeInference.ts(10,39): error TS2322: Type 'IPromise<number>' is not assignable to type 'number | PromiseLike<number>'.
+  Type 'IPromise<number>' is not assignable to type 'PromiseLike<number>'.
+    Types of property 'then' are incompatible.
+      Type '<U>(success?: (value: number) => IPromise<U>) => IPromise<U>' is not assignable to type '<TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => PromiseLike<TResult1 | TResult2>'.
+        Types of parameters 'success' and 'onfulfilled' are incompatible.
+          Type 'TResult1 | PromiseLike<TResult1>' is not assignable to type 'IPromise<TResult1 | TResult2>'.
+            Type 'TResult1' is not assignable to type 'IPromise<TResult1 | TResult2>'.
 
 
 ==== tests/cases/compiler/promiseTypeInference.ts (1 errors) ====
@@ -19,13 +18,13 @@ tests/cases/compiler/promiseTypeInference.ts(10,34): error TS2345: Argument of t
     declare function convert(s: string): IPromise<number>;
     
     var $$x = load("something").then(s => convert(s));
-                                     ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(s: string) => IPromise<number>' is not assignable to parameter of type '(value: string) => number | PromiseLike<number>'.
-!!! error TS2345:   Type 'IPromise<number>' is not assignable to type 'number | PromiseLike<number>'.
-!!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'PromiseLike<number>'.
-!!! error TS2345:       Types of property 'then' are incompatible.
-!!! error TS2345:         Type '<U>(success?: (value: number) => IPromise<U>) => IPromise<U>' is not assignable to type '<TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => PromiseLike<TResult1 | TResult2>'.
-!!! error TS2345:           Types of parameters 'success' and 'onfulfilled' are incompatible.
-!!! error TS2345:             Type 'TResult1 | PromiseLike<TResult1>' is not assignable to type 'IPromise<TResult1 | TResult2>'.
-!!! error TS2345:               Type 'TResult1' is not assignable to type 'IPromise<TResult1 | TResult2>'.
+                                          ~~~~~~~~~~
+!!! error TS2322: Type 'IPromise<number>' is not assignable to type 'number | PromiseLike<number>'.
+!!! error TS2322:   Type 'IPromise<number>' is not assignable to type 'PromiseLike<number>'.
+!!! error TS2322:     Types of property 'then' are incompatible.
+!!! error TS2322:       Type '<U>(success?: (value: number) => IPromise<U>) => IPromise<U>' is not assignable to type '<TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => PromiseLike<TResult1 | TResult2>'.
+!!! error TS2322:         Types of parameters 'success' and 'onfulfilled' are incompatible.
+!!! error TS2322:           Type 'TResult1 | PromiseLike<TResult1>' is not assignable to type 'IPromise<TResult1 | TResult2>'.
+!!! error TS2322:             Type 'TResult1' is not assignable to type 'IPromise<TResult1 | TResult2>'.
+!!! related TS6502 /.ts/lib.es5.d.ts:1336:57: The expected type comes from the return type of this signature.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/targetTypeTest3.errors.txt b/tests/baselines/reference/targetTypeTest3.errors.txt
index f5dab732ed..40d24da28d 100644
--- a/tests/baselines/reference/targetTypeTest3.errors.txt
+++ b/tests/baselines/reference/targetTypeTest3.errors.txt
@@ -1,17 +1,16 @@
-tests/cases/compiler/targetTypeTest3.ts(4,5): error TS2322: Type '(string | number)[]' is not assignable to type 'string[]'.
-  Type 'string | number' is not assignable to type 'string'.
-    Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/targetTypeTest3.ts(4,21): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/targetTypeTest3.ts(4,23): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/compiler/targetTypeTest3.ts (1 errors) ====
+==== tests/cases/compiler/targetTypeTest3.ts (2 errors) ====
     // Test target typing for array literals and call expressions
     
     
     var a : string[] = [1,2,"3"]; // should produce an error
-        ~
-!!! error TS2322: Type '(string | number)[]' is not assignable to type 'string[]'.
-!!! error TS2322:   Type 'string | number' is not assignable to type 'string'.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+                        ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+                          ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
     
     
     function func1(stuff:any[]) { return stuff; }
diff --git a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.errors.txt b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.errors.txt
index 32c1a470bc..6335da5bfd 100644
--- a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.errors.txt
+++ b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/trailingCommaInHeterogenousArrayLiteral1.ts(5,19): error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-  Type 'string | number' is not assignable to type 'number'.
-    Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/trailingCommaInHeterogenousArrayLiteral1.ts(6,19): error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
+tests/cases/compiler/trailingCommaInHeterogenousArrayLiteral1.ts(5,26): error TS2322: Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/trailingCommaInHeterogenousArrayLiteral1.ts(6,26): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/trailingCommaInHeterogenousArrayLiteral1.ts (2 errors) ====
@@ -10,13 +8,11 @@ tests/cases/compiler/trailingCommaInHeterogenousArrayLiteral1.ts(6,19): error TS
         callTest() {
             // these two should give the same error
             this.test([1, 2, "hi", 5, ]);
-                      ~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
-!!! error TS2345:   Type 'string | number' is not assignable to type 'number'.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+                             ~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
             this.test([1, 2, "hi", 5]); 
-                      ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(string | number)[]' is not assignable to parameter of type 'number[]'.
+                             ~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
         }
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.errors.txt b/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.errors.txt
index 255d0eb32b..565485f03b 100644
--- a/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.errors.txt
+++ b/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.errors.txt
@@ -15,5 +15,4 @@ tests/cases/compiler/file.tsx(11,14): error TS2322: Type 'number' is not assigna
     <SFC<string> prop={1}></SFC>; // should error
                  ~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
-!!! related TS6500 /.ts/lib.es5.d.ts:1382:39: The expected type comes from property 'prop' which is declared here on type 'Record<string, string>'
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt
index 9888c8558f..3b7750f23f 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(11,17): error TS2344: Type '{}' does not satisfy the constraint 'number'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(16,23): error TS2344: Type 'number' does not satisfy the constraint 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(17,23): error TS2344: Type '{}' does not satisfy the constraint 'number'.
-tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(33,15): error TS2345: Argument of type '() => string' is not assignable to parameter of type '() => Window'.
-  Type 'string' is not assignable to type 'Window'.
+tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(33,21): error TS2322: Type 'string' is not assignable to type 'Window'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(35,15): error TS2344: Type 'number' does not satisfy the constraint 'Window'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(41,35): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
@@ -61,9 +60,9 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConst
     // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
     function someGenerics3<T extends Window>(producer: () => T) { }
     someGenerics3(() => ''); // Error
-                  ~~~~~~~~
-!!! error TS2345: Argument of type '() => string' is not assignable to parameter of type '() => Window'.
-!!! error TS2345:   Type 'string' is not assignable to type 'Window'.
+                        ~~
+!!! error TS2322: Type 'string' is not assignable to type 'Window'.
+!!! related TS6502 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts:32:52: The expected type comes from the return type of this signature.
     someGenerics3<Window>(() => undefined);
     someGenerics3<number>(() => 3); // Error
                   ~~~~~~
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
index 5a6047222e..e2551020f8 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,25): error TS2345: Argument of type '(x: A) => A' is not assignable to parameter of type '(x: A) => B'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A'.
+tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30): error TS2322: Type 'A' is not assignable to type 'B'.
+  Property 'b' is missing in type 'A'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts (1 errors) ====
@@ -11,7 +10,7 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,25):
     var a: A, b: B;
     
     var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
-                            ~~~~~~
-!!! error TS2345: Argument of type '(x: A) => A' is not assignable to parameter of type '(x: A) => B'.
-!!! error TS2345:   Type 'A' is not assignable to type 'B'.
-!!! error TS2345:     Property 'b' is missing in type 'A'.
\ No newline at end of file
+                                 ~
+!!! error TS2322: Type 'A' is not assignable to type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A'.
+!!! related TS6502 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts:1:51: The expected type comes from the return type of this signature.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
index cd0801f7ba..d678fb7f90 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,29): error TS2345: Argument of type '(t2: A) => A' is not assignable to parameter of type '(t2: A) => B'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A'.
+tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35): error TS2322: Type 'A' is not assignable to type 'B'.
+  Property 'b' is missing in type 'A'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts (1 errors) ====
@@ -11,7 +10,7 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,29):
     var a: A, b: B;
     
     var d = f(a, b, u2 => u2.b, t2 => t2);
-                                ~~~~~~~~
-!!! error TS2345: Argument of type '(t2: A) => A' is not assignable to parameter of type '(t2: A) => B'.
-!!! error TS2345:   Type 'A' is not assignable to type 'B'.
-!!! error TS2345:     Property 'b' is missing in type 'A'.
\ No newline at end of file
+                                      ~~
+!!! error TS2322: Type 'A' is not assignable to type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A'.
+!!! related TS6502 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts:1:56: The expected type comes from the return type of this signature.
\ No newline at end of file
diff --git a/tests/baselines/reference/widenedTypes.errors.txt b/tests/baselines/reference/widenedTypes.errors.txt
index aac9627ade..fb6779ff0e 100644
--- a/tests/baselines/reference/widenedTypes.errors.txt
+++ b/tests/baselines/reference/widenedTypes.errors.txt
@@ -5,8 +5,7 @@ tests/cases/compiler/widenedTypes.ts(7,15): error TS2531: Object is possibly 'nu
 tests/cases/compiler/widenedTypes.ts(9,14): error TS2695: Left side of comma operator is unused and has no side effects.
 tests/cases/compiler/widenedTypes.ts(10,1): error TS2322: Type '""' is not assignable to type 'number'.
 tests/cases/compiler/widenedTypes.ts(17,1): error TS2322: Type '""' is not assignable to type 'number'.
-tests/cases/compiler/widenedTypes.ts(22,5): error TS2322: Type 'number[]' is not assignable to type 'string[]'.
-  Type 'number' is not assignable to type 'string'.
+tests/cases/compiler/widenedTypes.ts(22,22): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/widenedTypes.ts(23,39): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -47,9 +46,8 @@ tests/cases/compiler/widenedTypes.ts(23,39): error TS2322: Type 'number' is not
     
     // Highlights the difference between array literals and object literals
     var arr: string[] = [3, null]; // not assignable because null is not widened. BCT is {}
-        ~~~
-!!! error TS2322: Type 'number[]' is not assignable to type 'string[]'.
-!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+                         ~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
     var obj: { [x: string]: string; } = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any
                                           ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt b/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt
index 65bfc5b20d..4b19087eea 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt
@@ -18,5 +18,4 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursi
     var r2 = r({ length: 3, charAt: (x: number) => { '' } }); // error
                             ~~~~~~
 !!! error TS2322: Type '(x: number) => void' is not assignable to type '(pos: number) => string'.
-!!! error TS2322:   Type 'void' is not assignable to type 'string'.
-!!! related TS6500 /.ts/lib.es5.d.ts:332:5: The expected type comes from property 'charAt' which is declared here on type 'string'
\ No newline at end of file
+!!! error TS2322:   Type 'void' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts b/tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts
new file mode 100644
index 0000000000..283c942438
--- /dev/null
+++ b/tests/cases/compiler/deepElaborationsIntoArrowExpressions.ts
@@ -0,0 +1,19 @@
+// @target: es6
+const a: {
+    y(): "a"
+} = {
+    y: () => "b"
+};
+
+interface Foo {
+    a: number;
+}
+
+function foo1(): () => Foo {
+    return () => ({a: ''});
+}
+
+function foo3(): Foo[] {
+    return [{a: ''}];
+}
+var y: Foo[] = [{a: ''}]
\ No newline at end of file