From 729daea5ca99cd33e58942b90b0188a3e991950b Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 1 Nov 2018 15:19:08 -0700
Subject: [PATCH 1/6] Slightly improve missing property errors

---
 src/compiler/checker.ts                       |  36 ++++--
 src/compiler/core.ts                          |   6 +-
 src/compiler/diagnosticMessages.json          |  12 ++
 src/compiler/utilities.ts                     |   6 +-
 src/services/codefixes/fixAddMissingMember.ts |   3 +
 ...umentExpressionContextualTyping.errors.txt |  12 +-
 .../arityAndOrderCompatibility01.errors.txt   |  36 +++---
 .../reference/arrayAssignmentTest1.errors.txt |  76 ++++++------
 .../reference/arrayAssignmentTest2.errors.txt |  40 +++---
 .../reference/arrayAssignmentTest3.errors.txt |   6 +-
 .../reference/arrayAssignmentTest4.errors.txt |   8 +-
 .../reference/arrayAssignmentTest5.errors.txt |   4 +-
 .../baselines/reference/arrayFrom.errors.txt  |   4 +-
 .../reference/arrayLiterals3.errors.txt       |  12 +-
 ...typeIsAssignableToReadonlyArray.errors.txt |   4 +-
 ...ambdaToNominalSubtypeOfFunction.errors.txt |  12 +-
 ...signingFromObjectToAnythingElse.errors.txt |   8 +-
 .../reference/assignmentCompat1.errors.txt    |   8 +-
 ...nmentCompatBetweenTupleAndArray.errors.txt |   4 +-
 .../reference/assignmentCompatBug2.errors.txt |  12 +-
 ...CompatFunctionsWithOptionalArgs.errors.txt |   6 +-
 ...gnmentCompatWithCallSignatures2.errors.txt |  32 ++---
 ...gnmentCompatWithCallSignatures3.errors.txt |   8 +-
 ...tCompatWithConstructSignatures2.errors.txt |  32 ++---
 ...tCompatWithConstructSignatures3.errors.txt |   8 +-
 ...ignmentCompatWithNumericIndexer.errors.txt |   8 +-
 ...gnmentCompatWithNumericIndexer2.errors.txt |   8 +-
 ...gnmentCompatWithNumericIndexer3.errors.txt |   8 +-
 ...ignmentCompatWithObjectMembers4.errors.txt |  12 +-
 ...ignmentCompatWithObjectMembers5.errors.txt |   8 +-
 ...atWithObjectMembersOptionality2.errors.txt |  36 +++---
 ...ObjectMembersStringNumericNames.errors.txt | 116 +++++++++---------
 ...signmentCompatWithStringIndexer.errors.txt |   8 +-
 ...ignmentCompatWithStringIndexer2.errors.txt |   8 +-
 ...ember-off-of-function-interface.errors.txt |  14 +--
 ...ember-off-of-function-interface.errors.txt |  14 +--
 .../assignmentToObjectAndFunction.errors.txt  |   4 +-
 tests/baselines/reference/bases.errors.txt    |   4 +-
 .../reference/bluebirdStaticThis.errors.txt   |   4 +-
 .../reference/castingTuple.errors.txt         |  18 +--
 .../reference/chainedAssignment1.errors.txt   |   8 +-
 .../reference/chainedAssignment3.errors.txt   |   4 +-
 .../chainedAssignmentChecking.errors.txt      |   8 +-
 ...ConstrainedToOtherTypeParameter.errors.txt |   4 +-
 .../reference/checkJsdocTypeTag6.errors.txt   |   4 +-
 .../checkJsxChildrenProperty14.errors.txt     |   4 +-
 .../checkJsxChildrenProperty2.errors.txt      |  20 +--
 .../checkJsxChildrenProperty5.errors.txt      |  12 +-
 ...assCanExtendConstructorFunction.errors.txt |   6 +-
 .../classImplementsClass2.errors.txt          |   8 +-
 .../classImplementsClass4.errors.txt          |   8 +-
 .../classImplementsClass7.errors.txt          |   4 +-
 ...sImplementsMergedClassInterface.errors.txt |  12 +-
 .../classWithMultipleBaseClasses.errors.txt   |   4 +-
 .../clodulesDerivedClasses.errors.txt         |   6 +-
 ...onalOperatorWithoutIdenticalBCT.errors.txt |   8 +-
 .../reference/conditionalTypes2.errors.txt    |  22 ++--
 .../reference/constraints0.errors.txt         |   6 +-
 ...atureInstatiationContravariance.errors.txt |   4 +-
 .../contextualTypeWithTuple.errors.txt        |  12 +-
 ...lTypeWithUnionTypeObjectLiteral.errors.txt |   4 +-
 .../reference/contextualTyping.errors.txt     |   4 +-
 .../reference/contextualTyping11.errors.txt   |   4 +-
 .../reference/contextualTyping5.errors.txt    |   4 +-
 .../reference/covariantCallbacks.errors.txt   |   4 +-
 ...ertyIsRelatableToTargetProperty.errors.txt |   4 +-
 .../declarationsAndAssignments.errors.txt     |   4 +-
 .../decoratorOnClassMethod10.errors.txt       |   6 +-
 .../deeplyNestedAssignabilityIssue.errors.txt |   8 +-
 ...rayBindingPatternAndAssignment2.errors.txt |   8 +-
 ...tructuringParameterDeclaration2.errors.txt |  10 +-
 ...cturingParameterDeclaration3ES5.errors.txt |   6 +-
 ...arameterDeclaration3ES5iterable.errors.txt |   6 +-
 ...cturingParameterDeclaration3ES6.errors.txt |   6 +-
 ...tructuringParameterDeclaration4.errors.txt |   6 +-
 ...tructuringParameterDeclaration5.errors.txt |  10 +-
 ...orExpressionsWhichCouldBeCalled.errors.txt |   8 +-
 .../differentTypesWithSameName.errors.txt     |   6 +-
 .../reference/elaboratedErrors.errors.txt     |   8 +-
 .../errorsWithInvokablesInUnions01.errors.txt |   4 +-
 ...AnnotationAndInvalidInitializer.errors.txt |  16 +--
 .../excessPropertyCheckWithUnions.errors.txt  |   4 +-
 .../exportDefaultStripsFreshness.errors.txt   |  12 +-
 ...fixingTypeParametersRepeatedly2.errors.txt |   4 +-
 tests/baselines/reference/for-of31.errors.txt |   4 +-
 .../reference/functionOverloads41.errors.txt  |   4 +-
 tests/baselines/reference/fuzzy.errors.txt    |  10 +-
 .../reference/generatorTypeCheck18.errors.txt |   4 +-
 .../reference/generatorTypeCheck20.errors.txt |   4 +-
 .../reference/generatorTypeCheck25.errors.txt |   4 +-
 .../reference/generatorTypeCheck7.errors.txt  |   4 +-
 .../genericArrayExtenstions.errors.txt        |   4 +-
 ...thObjectTypeArgsAndConstraints3.errors.txt |   4 +-
 ...thObjectTypeArgsAndConstraints4.errors.txt |   6 +-
 ...thObjectTypeArgsAndConstraints5.errors.txt |   6 +-
 .../genericCallWithTupleType.errors.txt       |   4 +-
 .../reference/genericConstraint2.errors.txt   |  10 +-
 .../genericRestParameters2.errors.txt         |   6 +-
 .../genericRestParameters3.errors.txt         |  52 +++-----
 .../genericTypeAssertions2.errors.txt         |  10 +-
 .../genericTypeConstraints.errors.txt         |   6 +-
 .../baselines/reference/generics1.errors.txt  |   6 +-
 .../baselines/reference/generics2.errors.txt  |   6 +-
 .../baselines/reference/generics5.errors.txt  |   6 +-
 ...rfaceExtendingClassWithPrivates.errors.txt |   8 +-
 ...faceExtendingClassWithPrivates2.errors.txt |  20 +--
 ...aceExtendingClassWithProtecteds.errors.txt |  12 +-
 ...tCallExpressionCheckReturntype1.errors.txt |  10 +-
 .../reference/incompatibleTypes.errors.txt    |   4 +-
 .../reference/inheritance1.errors.txt         |  48 ++++----
 ...sxFactoryDeclarationsLocalTypes.errors.txt |  14 +--
 ...xFactoryLocalTypeGlobalFallback.errors.txt |   4 +-
 .../reference/intTypeCheck.errors.txt         |  28 ++---
 .../interfaceAssignmentCompat.errors.txt      |   6 +-
 .../interfaceDeclaration1.errors.txt          |   4 +-
 .../interfaceDeclaration4.errors.txt          |   8 +-
 ...terfaceExtendsClassWithPrivate1.errors.txt |  12 +-
 .../interfaceImplementation2.errors.txt       |   4 +-
 .../interfaceImplementation3.errors.txt       |   4 +-
 .../interfaceImplementation4.errors.txt       |   4 +-
 .../interfaceImplementation6.errors.txt       |   4 +-
 .../reference/interfaceInheritance.errors.txt |   8 +-
 .../intersectionAndUnionTypes.errors.txt      |  44 +++----
 .../intersectionAsWeakTypeSource.errors.txt   |   4 +-
 .../intersectionTypeAssignment.errors.txt     |  16 +--
 .../invalidReturnStatements.errors.txt        |   8 +-
 .../iterableArrayPattern10.errors.txt         |   6 +-
 .../iterableArrayPattern13.errors.txt         |   6 +-
 .../iterableArrayPattern16.errors.txt         |   6 +-
 .../iterableArrayPattern17.errors.txt         |   6 +-
 .../iterableArrayPattern18.errors.txt         |   6 +-
 .../iterableArrayPattern19.errors.txt         |   6 +-
 .../iterableArrayPattern26.errors.txt         |   6 +-
 .../iterableArrayPattern7.errors.txt          |   4 +-
 .../iteratorSpreadInArray9.errors.txt         |   4 +-
 .../jsContainerMergeTsDeclaration3.errors.txt |   4 +-
 .../reference/jsdocFunctionType.errors.txt    |   6 +-
 .../reference/jsdocTemplateTag3.errors.txt    |   6 +-
 .../reference/jsdocTypeTagCast.errors.txt     |  24 ++--
 .../reference/mappedTypeErrors.errors.txt     |   6 +-
 .../reference/mappedTypes6.errors.txt         |  16 +--
 ...nterfacesWithInheritedPrivates2.errors.txt |   4 +-
 ...wingGenericTypeFromInstanceof01.errors.txt |   6 +-
 .../noImplicitAnyInCastExpression.errors.txt  |   6 +-
 .../nonIterableRestElement3.errors.txt        |   4 +-
 .../nonPrimitiveAssignError.errors.txt        |   4 +-
 ...eralFunctionArgContextualTyping.errors.txt |  12 +-
 ...ralFunctionArgContextualTyping2.errors.txt |   6 +-
 .../objectLiteralIndexerErrors.errors.txt     |   4 +-
 .../objectLiteralNormalization.errors.txt     |  12 +-
 ...handPropertiesFunctionArgument2.errors.txt |   6 +-
 .../reference/objectSpreadNegative.errors.txt |   8 +-
 ...bjectTypesIdentityWithPrivates3.errors.txt |   6 +-
 .../optionalPropertiesInClasses.errors.txt    |   4 +-
 .../optionalPropertiesTest.errors.txt         |  12 +-
 .../overloadingOnConstants1.errors.txt        |  16 +--
 ...nWithConstraintCheckingDeferred.errors.txt |  12 +-
 .../overloadsWithProvisionalErrors.errors.txt |   8 +-
 .../reference/promisePermutations.errors.txt  |   6 +-
 .../reference/promisePermutations2.errors.txt |   6 +-
 .../reference/promisePermutations3.errors.txt |  12 +-
 .../promisesWithConstraints.errors.txt        |   4 +-
 tests/baselines/reference/qualify.errors.txt  |  16 +--
 .../recursiveClassReferenceTest.errors.txt    |   6 +-
 .../recursiveInheritance3.errors.txt          |   4 +-
 .../recursiveIntersectionTypes.errors.txt     |   4 +-
 .../requireOfJsonFileInJsFile.errors.txt      |   8 +-
 .../reference/restTupleElements1.errors.txt   |  24 ++--
 .../restTuplesFromContextualTypes.errors.txt  |   6 +-
 ...cMemberOfAnotherClassAssignment.errors.txt |  16 +--
 .../reference/strictBindCallApply1.errors.txt |   6 +-
 .../strictFunctionTypesErrors.errors.txt      |   4 +-
 .../reference/strictTupleLength.errors.txt    |   4 +-
 ...ConstrainsPropertyDeclarations2.errors.txt |   8 +-
 .../subtypingWithNumericIndexer2.errors.txt   |   6 +-
 .../subtypingWithNumericIndexer3.errors.txt   |   6 +-
 .../subtypingWithNumericIndexer4.errors.txt   |   6 +-
 .../subtypingWithNumericIndexer5.errors.txt   |   4 +-
 .../subtypingWithObjectMembers3.errors.txt    |   6 +-
 .../subtypingWithObjectMembers5.errors.txt    |  12 +-
 .../subtypingWithStringIndexer2.errors.txt    |   6 +-
 .../subtypingWithStringIndexer3.errors.txt    |   6 +-
 .../subtypingWithStringIndexer4.errors.txt    |   6 +-
 .../reference/symbolProperty10.errors.txt     |   4 +-
 .../reference/symbolProperty25.errors.txt     |   4 +-
 .../reference/symbolProperty52.errors.txt     |   4 +-
 .../reference/symbolProperty9.errors.txt      |   4 +-
 ...eStringsWithOverloadResolution1.errors.txt |   6 +-
 ...ingsWithOverloadResolution1_ES6.errors.txt |   6 +-
 ...tringsArrayTypeDefinedInES5Mode.errors.txt |   6 +-
 ...ringsArrayTypeNotDefinedES5Mode.errors.txt |   6 +-
 ...ingsArrayTypeRedefinedInES6Mode.errors.txt |   6 +-
 .../thisTypeInFunctionsNegative.errors.txt    |  22 ++--
 .../tsxAttributeResolution1.errors.txt        |   4 +-
 .../tsxAttributeResolution12.errors.txt       |   8 +-
 .../tsxAttributeResolution3.errors.txt        |   4 +-
 .../tsxAttributeResolution5.errors.txt        |   8 +-
 .../tsxAttributeResolution6.errors.txt        |   4 +-
 .../tsxInvokeComponentType.errors.txt         |   4 +-
 .../tsxLibraryManagedAttributes.errors.txt    |   8 +-
 ...ponentWithDefaultTypeParameter3.errors.txt |   4 +-
 ...tsxSpreadAttributesResolution16.errors.txt |   4 +-
 .../tsxSpreadAttributesResolution2.errors.txt |   8 +-
 .../tsxSpreadAttributesResolution6.errors.txt |   4 +-
 ...elessFunctionComponentOverload4.errors.txt |   8 +-
 ...tsxStatelessFunctionComponents1.errors.txt |   4 +-
 ...ionComponentsWithTypeArguments4.errors.txt |   8 +-
 .../reference/tsxUnionElementType6.errors.txt |   8 +-
 .../baselines/reference/tupleTypes.errors.txt |   8 +-
 ...ntInferenceWithClassExpression2.errors.txt |   6 +-
 ...renceWithConstraintAsCommonRoot.errors.txt |   6 +-
 .../reference/typeAssertions.errors.txt       |  24 ++--
 ...sertionsWithIntersectionTypes01.errors.txt |   6 +-
 .../typeGuardFunctionErrors.errors.txt        |  10 +-
 ...peGuardFunctionOfFormThisErrors.errors.txt |   8 +-
 .../baselines/reference/typeMatch1.errors.txt |   4 +-
 .../baselines/reference/typeMatch2.errors.txt |  16 +--
 .../typeParamExtendsOtherTypeParam.errors.txt |  30 ++---
 ...gWithContextSensitiveArguments2.errors.txt |   4 +-
 ...gWithContextSensitiveArguments3.errors.txt |   4 +-
 .../reference/typeRelationships.errors.txt    |   4 +-
 .../typedefMultipleTypeParameters.errors.txt  |  12 +-
 .../typeofAmbientExternalModules.errors.txt   |   8 +-
 .../typeofExternalModules.errors.txt          |   8 +-
 .../typeofInternalModules.errors.txt          |   8 +-
 .../types.asyncGenerators.esnext.2.errors.txt |  12 +-
 ...yExternalModuleStillHasInstance.errors.txt |   4 +-
 ...unionTypeErrorMessageTypeRefs01.errors.txt |  12 +-
 ...eWithRecursiveSubtypeReduction2.errors.txt |   8 +-
 .../unionTypesAssignability.errors.txt        |  16 +--
 ...unctionCallsWithTypeParameters1.errors.txt |   4 +-
 231 files changed, 1024 insertions(+), 1207 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7df0414b90bba..efa911bf71d95 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11315,6 +11315,7 @@ namespace ts {
             let depth = 0;
             let expandingFlags = ExpandingFlags.None;
             let overflow = false;
+            let suppressNextError = false;
 
             Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
 
@@ -11352,9 +11353,9 @@ namespace ts {
             }
             return result !== Ternary.False;
 
-            function reportError(message: DiagnosticMessage, arg0?: string, arg1?: string, arg2?: string): void {
+            function reportError(message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number, arg3?: string | number): void {
                 Debug.assert(!!errorNode);
-                errorInfo = chainDiagnosticMessages(errorInfo, message, arg0, arg1, arg2);
+                errorInfo = chainDiagnosticMessages(errorInfo, message, arg0, arg1, arg2, arg3);
             }
 
             function reportRelationError(message: DiagnosticMessage | undefined, source: Type, target: Type) {
@@ -11562,7 +11563,12 @@ namespace ts {
                 }
 
                 if (!result && reportErrors) {
-                    if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Primitive) {
+                    if (suppressNextError) {
+                        // Used by, eg, missing property checking to replace the top-level message with a more informative one
+                        suppressNextError = false;
+                        return result;
+                    }
+                    else if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Primitive) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
                     else if (source.symbol && source.flags & TypeFlags.Object && globalObjectType === source) {
@@ -12209,7 +12215,20 @@ namespace ts {
                 const unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties);
                 if (unmatchedProperty) {
                     if (reportErrors) {
-                        reportError(Diagnostics.Property_0_is_missing_in_type_1, symbolToString(unmatchedProperty), typeToString(source));
+                        const props = arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties));
+                        if (headMessage && headMessage.code !== Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
+                            headMessage.code !== Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code) {
+                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                        }
+                        if (props.length === 1) {
+                            reportError(Diagnostics.Property_0_is_missing_in_type_1_but_present_in_type_2, symbolToString(unmatchedProperty), typeToString(source), typeToString(target));
+                        }
+                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
+                            reportError(Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), map(props.slice(0, 4), p => symbolToString(p)).join(", "), props.length - 4);
+                        }
+                        else {
+                            reportError(Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), map(props, p => symbolToString(p)).join(", "));
+                        }
                     }
                     return Ternary.False;
                 }
@@ -13591,17 +13610,20 @@ namespace ts {
             return getTypeFromInference(inference);
         }
 
-        function getUnmatchedProperty(source: Type, target: Type, requireOptionalProperties: boolean) {
+        function* getUnmatchedProperties(source: Type, target: Type, requireOptionalProperties: boolean) {
             const properties = target.flags & TypeFlags.Intersection ? getPropertiesOfUnionOrIntersectionType(<IntersectionType>target) : getPropertiesOfObjectType(target);
             for (const targetProp of properties) {
                 if (requireOptionalProperties || !(targetProp.flags & SymbolFlags.Optional)) {
                     const sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (!sourceProp) {
-                        return targetProp;
+                        yield targetProp;
                     }
                 }
             }
-            return undefined;
+        }
+
+        function getUnmatchedProperty(source: Type, target: Type, requireOptionalProperties: boolean): Symbol | undefined {
+            return getUnmatchedProperties(source, target, requireOptionalProperties).next().value;
         }
 
         function tupleTypesDefinitelyUnrelated(source: TupleTypeReference, target: TupleTypeReference) {
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 8c976cee9ee56..b5c4f74bc3c9a 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1255,9 +1255,9 @@ namespace ts {
     }
 
     /** Shims `Array.from`. */
-    export function arrayFrom<T, U>(iterator: Iterator<T>, map: (t: T) => U): U[];
-    export function arrayFrom<T>(iterator: Iterator<T>): T[];
-    export function arrayFrom(iterator: Iterator<any>, map?: (t: any) => any): any[] {
+    export function arrayFrom<T, U>(iterator: Iterator<T> | IterableIterator<T>, map: (t: T) => U): U[];
+    export function arrayFrom<T>(iterator: Iterator<T> | IterableIterator<T>): T[];
+    export function arrayFrom(iterator: Iterator<any> | IterableIterator<any>, map?: (t: any) => any): any[] {
         const result: any[] = [];
         for (let { value, done } = iterator.next(); !done; { value, done } = iterator.next()) {
             result.push(map ? map(value) : value);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 01aa861cabb76..2382119c66d4e 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2493,6 +2493,18 @@
         "category": "Error",
         "code": 2734
     },
+    "Type '{0}' is missing the following properties from type '{1}': {2}": {
+        "category": "Error",
+        "code": 2735
+    },
+    "Type '{0}' is missing the following properties from type '{1}': {2}, and {3} more.": {
+        "category": "Error",
+        "code": 2736
+    },
+    "Property '{0}' is missing in type {1}' but present in type '{2}'.": {
+        "category": "Error",
+        "code": 2737
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 991e403f52e5a..c33bd1d3f4f51 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -6896,8 +6896,8 @@ namespace ts {
         getSourceMapSourceConstructor: () => <any>SourceMapSource,
     };
 
-    export function formatStringFromArgs(text: string, args: ArrayLike<string>, baseIndex = 0): string {
-        return text.replace(/{(\d+)}/g, (_match, index: string) => Debug.assertDefined(args[+index + baseIndex]));
+    export function formatStringFromArgs(text: string, args: ArrayLike<string | number>, baseIndex = 0): string {
+        return text.replace(/{(\d+)}/g, (_match, index: string) => "" + Debug.assertDefined(args[+index + baseIndex]));
     }
 
     export let localizedDiagnosticMessages: MapLike<string> | undefined;
@@ -6976,7 +6976,7 @@ namespace ts {
         };
     }
 
-    export function chainDiagnosticMessages(details: DiagnosticMessageChain | undefined, message: DiagnosticMessage, ...args: (string | undefined)[]): DiagnosticMessageChain;
+    export function chainDiagnosticMessages(details: DiagnosticMessageChain | undefined, message: DiagnosticMessage, ...args: (string | number | undefined)[]): DiagnosticMessageChain;
     export function chainDiagnosticMessages(details: DiagnosticMessageChain | undefined, message: DiagnosticMessage): DiagnosticMessageChain {
         let text = getLocaleSpecificMessage(message);
 
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index dda0903562a7a..f763bdc39dc8d 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -4,6 +4,9 @@ namespace ts.codefix {
     const errorCodes = [
         Diagnostics.Property_0_does_not_exist_on_type_1.code,
         Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2.code,
+        Diagnostics.Property_0_is_missing_in_type_1_but_present_in_type_2.code,
+        Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2.code,
+        Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more.code
     ];
     const fixId = "addMissingMember";
     registerCodeFix({
diff --git a/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt b/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt
index 87c3a6d0b37a3..61648f9faf748 100644
--- a/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt
+++ b/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt
@@ -1,12 +1,10 @@
-tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(16,5): error TS2345: Argument of type '(string | number | boolean)[]' is not assignable to parameter of type '[string, number, boolean]'.
-  Property '0' is missing in type '(string | number | boolean)[]'.
+tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(16,5): error TS2735: Type '(string | number | boolean)[]' is missing the following properties from type '[string, number, boolean]': 0, 1, 2
 tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(17,5): error TS2345: Argument of type '[string, number, true, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
   Types of property 'length' are incompatible.
     Type 'number' is not assignable to type '3'.
 tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(18,5): error TS2345: Argument of type '{ x: (string | number)[]; y: { c: boolean; d: string; e: number; }; }' is not assignable to parameter of type '{ x: [any, any]; y: { c: any; d: any; e: any; }; }'.
   Types of property 'x' are incompatible.
-    Type '(string | number)[]' is not assignable to type '[any, any]'.
-      Property '0' is missing in type '(string | number)[]'.
+    Type '(string | number)[]' is missing the following properties from type '[any, any]': 0, 1
 
 
 ==== tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts (3 errors) ====
@@ -27,8 +25,7 @@ tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextua
     
     baz(array);                          // Error
         ~~~~~
-!!! error TS2345: Argument of type '(string | number | boolean)[]' is not assignable to parameter of type '[string, number, boolean]'.
-!!! error TS2345:   Property '0' is missing in type '(string | number | boolean)[]'.
+!!! error TS2735: Type '(string | number | boolean)[]' is missing the following properties from type '[string, number, boolean]': 0, 1, 2
     baz(["string", 1, true, ...array]);  // Error
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '[string, number, true, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
@@ -38,5 +35,4 @@ tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextua
         ~
 !!! error TS2345: Argument of type '{ x: (string | number)[]; y: { c: boolean; d: string; e: number; }; }' is not assignable to parameter of type '{ x: [any, any]; y: { c: any; d: any; e: any; }; }'.
 !!! error TS2345:   Types of property 'x' are incompatible.
-!!! error TS2345:     Type '(string | number)[]' is not assignable to type '[any, any]'.
-!!! error TS2345:       Property '0' is missing in type '(string | number)[]'.
\ No newline at end of file
+!!! error TS2345:     Type '(string | number)[]' is missing the following properties from type '[any, any]': 0, 1
\ No newline at end of file
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
index f30dabd56893e..46540eab0c870 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
@@ -3,17 +3,17 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,12): erro
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2461: Type '{ 0: string; 1: number; length: 2; }' is not an array type.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,12): error TS2460: Type '{ 0: string; 1: number; length: 2; }' has no property '2'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type '[string, number]'.
+  Property '2' is missing in type [string, number]' but present in type '[number, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type 'StrNum'.
+  Property '2' is missing in type StrNum' but present in type '[number, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
+  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type '[string, number]'.
+  Property '2' is missing in type [string, number]' but present in type '[string, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type 'StrNum'.
+  Property '2' is missing in type StrNum' but present in type '[string, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
+  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '[string, number]' is not assignable to type '[number]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
@@ -21,7 +21,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number]'.
-  Property 'pop' is missing in type '{ 0: string; 1: number; length: 2; }'.
+  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number]': pop, push, concat, join, and 15 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '[string, number]' is not assignable to type '[string]'.
   Types of property 'length' are incompatible.
     Type '2' is not assignable to type '1'.
@@ -29,14 +29,14 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error
   Types of property 'length' are incompatible.
     Type '2' is not assignable to type '1'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string]'.
-  Property 'pop' is missing in type '{ 0: string; 1: number; length: 2; }'.
+  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string]': pop, push, concat, join, and 15 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(31,5): error TS2322: Type 'StrNum' is not assignable to type '[number, string]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, string]'.
-  Property 'pop' is missing in type '{ 0: string; 1: number; length: 2; }'.
+  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, string]': pop, push, concat, join, and 15 more.
 
 
 ==== tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts (19 errors) ====
@@ -68,27 +68,27 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
     var j1: [number, number, number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '[string, number]'.
+!!! error TS2322:   Property '2' is missing in type [string, number]' but present in type '[number, number, number]'.
     var j2: [number, number, number] = y;
         ~~
 !!! error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type 'StrNum'.
+!!! error TS2322:   Property '2' is missing in type StrNum' but present in type '[number, number, number]'.
     var j3: [number, number, number] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
+!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
     var k1: [string, number, number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '[string, number]'.
+!!! error TS2322:   Property '2' is missing in type [string, number]' but present in type '[string, number, number]'.
     var k2: [string, number, number] = y;
         ~~
 !!! error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type 'StrNum'.
+!!! error TS2322:   Property '2' is missing in type StrNum' but present in type '[string, number, number]'.
     var k3: [string, number, number] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
+!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
     var l1: [number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number]'.
@@ -102,7 +102,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
     var l3: [number] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number]'.
-!!! error TS2322:   Property 'pop' is missing in type '{ 0: string; 1: number; length: 2; }'.
+!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number]': pop, push, concat, join, and 15 more.
     var m1: [string] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[string]'.
@@ -116,7 +116,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
     var m3: [string] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string]'.
-!!! error TS2322:   Property 'pop' is missing in type '{ 0: string; 1: number; length: 2; }'.
+!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string]': pop, push, concat, join, and 15 more.
     var n1: [number, string] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
@@ -129,7 +129,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
     var n3: [number, string] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, string]'.
-!!! error TS2322:   Property 'pop' is missing in type '{ 0: string; 1: number; length: 2; }'.
+!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, string]': pop, push, concat, join, and 15 more.
     var o1: [string, number] = x;
     var o2: [string, number] = y;
     var o3: [string, number] = y;
diff --git a/tests/baselines/reference/arrayAssignmentTest1.errors.txt b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
index e07306b19b21c..d53156db918fb 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
@@ -1,50 +1,50 @@
 tests/cases/compiler/arrayAssignmentTest1.ts(46,5): error TS2322: Type 'undefined[]' is not assignable to type 'I1'.
-  Property 'IM1' is missing in type 'undefined[]'.
+  Property 'IM1' is missing in type undefined[]' but present in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(47,5): error TS2322: Type 'undefined[]' is not assignable to type 'C1'.
-  Property 'IM1' is missing in type 'undefined[]'.
+  Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(48,5): error TS2322: Type 'undefined[]' is not assignable to type 'C2'.
-  Property 'C2M1' is missing in type 'undefined[]'.
+  Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(49,5): error TS2322: Type 'undefined[]' is not assignable to type 'C3'.
-  Property 'CM3M1' is missing in type 'undefined[]'.
+  Property 'CM3M1' is missing in type undefined[]' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(60,1): error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
   Type 'C3' is not assignable to type 'I1'.
-    Property 'IM1' is missing in type 'C3'.
+    Property 'IM1' is missing in type C3' but present in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(64,1): error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
   Type 'I1' is not assignable to type 'C1'.
-    Property 'C1M1' is missing in type 'I1'.
+    Property 'C1M1' is missing in type I1' but present in type 'C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(65,1): error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
   Type 'C3' is not assignable to type 'C1'.
-    Property 'IM1' is missing in type 'C3'.
+    Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(68,1): error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
   Type 'C1' is not assignable to type 'C2'.
-    Property 'C2M1' is missing in type 'C1'.
+    Property 'C2M1' is missing in type C1' but present in type 'C2'.
 tests/cases/compiler/arrayAssignmentTest1.ts(69,1): error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
   Type 'I1' is not assignable to type 'C2'.
-    Property 'C2M1' is missing in type 'I1'.
+    Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(70,1): error TS2322: Type 'C3[]' is not assignable to type 'C2[]'.
   Type 'C3' is not assignable to type 'C2'.
-    Property 'C2M1' is missing in type 'C3'.
+    Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(75,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
   Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C2'.
+    Property 'CM3M1' is missing in type C2' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(76,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
   Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C1'.
+    Property 'CM3M1' is missing in type C1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(77,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
   Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'I1'.
+    Property 'CM3M1' is missing in type I1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(79,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-  Property 'pop' is missing in type '() => C1'.
+  Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
 tests/cases/compiler/arrayAssignmentTest1.ts(80,1): error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-  Property 'length' is missing in type '{ one: number; }'.
+  Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest1.ts(82,1): error TS2322: Type 'C1' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C1'.
+  Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest1.ts(83,1): error TS2322: Type 'C2' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C2'.
+  Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest1.ts(84,1): error TS2322: Type 'C3' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C3'.
+  Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'I1'.
+  Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest1.ts (19 errors) ====
@@ -96,19 +96,19 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     var i1_error: I1 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'I1'.
-!!! error TS2322:   Property 'IM1' is missing in type 'undefined[]'.
+!!! error TS2322:   Property 'IM1' is missing in type undefined[]' but present in type 'I1'.
     var c1_error: C1 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'C1'.
-!!! error TS2322:   Property 'IM1' is missing in type 'undefined[]'.
+!!! error TS2322:   Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
     var c2_error: C2 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'C2M1' is missing in type 'undefined[]'.
+!!! error TS2322:   Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
     var c3_error: C3 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'C3'.
-!!! error TS2322:   Property 'CM3M1' is missing in type 'undefined[]'.
+!!! error TS2322:   Property 'CM3M1' is missing in type undefined[]' but present in type 'C3'.
     
     
     arr_any = arr_i1; // should be ok - is
@@ -123,7 +123,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
 !!! error TS2322:   Type 'C3' is not assignable to type 'I1'.
-!!! error TS2322:     Property 'IM1' is missing in type 'C3'.
+!!! error TS2322:     Property 'IM1' is missing in type C3' but present in type 'I1'.
     
     arr_c1 = arr_c1; // should be ok - subtype relationship - is
     arr_c1 = arr_c2; // should be ok - subtype relationship - is
@@ -131,29 +131,29 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C1'.
-!!! error TS2322:     Property 'C1M1' is missing in type 'I1'.
+!!! error TS2322:     Property 'C1M1' is missing in type I1' but present in type 'C1'.
     arr_c1 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
 !!! error TS2322:   Type 'C3' is not assignable to type 'C1'.
-!!! error TS2322:     Property 'IM1' is missing in type 'C3'.
+!!! error TS2322:     Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
     
     arr_c2 = arr_c2; // should be ok - subtype relationship - is
     arr_c2 = arr_c1; // should be an error - subtype relationship - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C2'.
-!!! error TS2322:     Property 'C2M1' is missing in type 'C1'.
+!!! error TS2322:     Property 'C2M1' is missing in type C1' but present in type 'C2'.
     arr_c2 = arr_i1; // should be an error - subtype relationship - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C2'.
-!!! error TS2322:     Property 'C2M1' is missing in type 'I1'.
+!!! error TS2322:     Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
     arr_c2 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'C2[]'.
 !!! error TS2322:   Type 'C3' is not assignable to type 'C2'.
-!!! error TS2322:     Property 'C2M1' is missing in type 'C3'.
+!!! error TS2322:     Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
     
     // "clean up bug" occurs at this point
     // if you move these three expressions to another file, they raise an error
@@ -162,40 +162,40 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C2'.
+!!! error TS2322:     Property 'CM3M1' is missing in type C2' but present in type 'C3'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C1'.
+!!! error TS2322:     Property 'CM3M1' is missing in type C1' but present in type 'C3'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'I1'.
+!!! error TS2322:     Property 'CM3M1' is missing in type I1' but present in type 'C3'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'pop' is missing in type '() => C1'.
+!!! error TS2322:   Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = o1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type '{ one: number; }'.
+!!! error TS2322:   Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = a1; // should be ok - is
     arr_any = c1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C1'.
+!!! error TS2322:   Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c2; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C2' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C2'.
+!!! error TS2322:   Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c3; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C3' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C3'.
+!!! error TS2322:   Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = i1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'I1' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'I1'.
\ No newline at end of file
+!!! error TS2322:   Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest2.errors.txt b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
index eca2f8ad6f5b7..2c90006648fbf 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
@@ -1,26 +1,26 @@
 tests/cases/compiler/arrayAssignmentTest2.ts(47,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
   Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C2'.
+    Property 'CM3M1' is missing in type C2' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(48,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
   Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C1'.
+    Property 'CM3M1' is missing in type C1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(49,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
   Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'I1'.
+    Property 'CM3M1' is missing in type I1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(51,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-  Property 'pop' is missing in type '() => C1'.
+  Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(52,1): error TS2322: Type '() => any' is not assignable to type 'any[]'.
-  Property 'pop' is missing in type '() => any'.
+  Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(53,1): error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-  Property 'length' is missing in type '{ one: number; }'.
+  Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(55,1): error TS2322: Type 'C1' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C1'.
+  Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(56,1): error TS2322: Type 'C2' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C2'.
+  Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(57,1): error TS2322: Type 'C3' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C3'.
+  Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2322: Type 'I1' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'I1'.
+  Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest2.ts (10 errors) ====
@@ -74,45 +74,45 @@ tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C2'.
+!!! error TS2322:     Property 'CM3M1' is missing in type C2' but present in type 'C3'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C1'.
+!!! error TS2322:     Property 'CM3M1' is missing in type C1' but present in type 'C3'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'I1'.
+!!! error TS2322:     Property 'CM3M1' is missing in type I1' but present in type 'C3'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'pop' is missing in type '() => C1'.
+!!! error TS2322:   Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = function () { return null;} // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type '() => any' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'pop' is missing in type '() => any'.
+!!! error TS2322:   Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = o1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type '{ one: number; }'.
+!!! error TS2322:   Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = a1; // should be ok - is
     arr_any = c1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C1'.
+!!! error TS2322:   Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c2; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C2' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C2'.
+!!! error TS2322:   Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c3; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C3' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C3'.
+!!! error TS2322:   Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = i1; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'I1' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'I1'.
+!!! error TS2322:   Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest3.errors.txt b/tests/baselines/reference/arrayAssignmentTest3.errors.txt
index 31347782c5d0c..ac02a6cb93e4a 100644
--- a/tests/baselines/reference/arrayAssignmentTest3.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest3.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/arrayAssignmentTest3.ts(12,25): error TS2345: Argument of type 'B' is not assignable to parameter of type 'B[]'.
-  Property 'length' is missing in type 'B'.
+tests/cases/compiler/arrayAssignmentTest3.ts(12,25): error TS2736: Type 'B' is missing the following properties from type 'B[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest3.ts (1 errors) ====
@@ -16,7 +15,6 @@ tests/cases/compiler/arrayAssignmentTest3.ts(12,25): error TS2345: Argument of t
     
     var xx = new a(null, 7, new B());
                             ~~~~~~~
-!!! error TS2345: Argument of type 'B' is not assignable to parameter of type 'B[]'.
-!!! error TS2345:   Property 'length' is missing in type 'B'.
+!!! error TS2736: Type 'B' is missing the following properties from type 'B[]': length, pop, push, concat, and 16 more.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest4.errors.txt b/tests/baselines/reference/arrayAssignmentTest4.errors.txt
index 2546c6abf0491..2e9507c30d81b 100644
--- a/tests/baselines/reference/arrayAssignmentTest4.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest4.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/arrayAssignmentTest4.ts(22,1): error TS2322: Type '() => any' is not assignable to type 'any[]'.
-  Property 'pop' is missing in type '() => any'.
+  Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
 tests/cases/compiler/arrayAssignmentTest4.ts(23,1): error TS2322: Type 'C3' is not assignable to type 'any[]'.
-  Property 'length' is missing in type 'C3'.
+  Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest4.ts (2 errors) ====
@@ -29,9 +29,9 @@ tests/cases/compiler/arrayAssignmentTest4.ts(23,1): error TS2322: Type 'C3' is n
     arr_any = function () { return null;} // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type '() => any' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'pop' is missing in type '() => any'.
+!!! error TS2322:   Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = c3; // should be an error - is
     ~~~~~~~
 !!! error TS2322: Type 'C3' is not assignable to type 'any[]'.
-!!! error TS2322:   Property 'length' is missing in type 'C3'.
+!!! error TS2322:   Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest5.errors.txt b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
index 3a45cad9ad7eb..37d9b677af1ec 100644
--- a/tests/baselines/reference/arrayAssignmentTest5.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
   Type 'IToken' is not assignable to type 'IStateToken'.
-    Property 'state' is missing in type 'IToken'.
+    Property 'state' is missing in type IToken' but present in type 'IStateToken'.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest5.ts (1 errors) ====
@@ -30,7 +30,7 @@ tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[
                     ~~~~~~
 !!! error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
 !!! error TS2322:   Type 'IToken' is not assignable to type 'IStateToken'.
-!!! error TS2322:     Property 'state' is missing in type 'IToken'.
+!!! error TS2322:     Property 'state' is missing in type IToken' but present in type 'IStateToken'.
                 if (tokens.length === 0) {
                     return this.onEnter(line, tokens, offset);        // <== this should produce an error since onEnter can not be called with (string, IStateToken[], offset)
                 }
diff --git a/tests/baselines/reference/arrayFrom.errors.txt b/tests/baselines/reference/arrayFrom.errors.txt
index 4685ec20db807..ee4ecc36e8c76 100644
--- a/tests/baselines/reference/arrayFrom.errors.txt
+++ b/tests/baselines/reference/arrayFrom.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/arrayFrom.ts(20,7): error TS2322: Type 'A[]' is not assignable to type 'B[]'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A'.
+    Property 'b' is missing in type A' but present in type 'B'.
 tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assignable to type 'B[]'.
 
 
@@ -28,7 +28,7 @@ tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assigna
           ~~~~~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A'.
+!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
     const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
     const result5: A[] = Array.from(inputALike);
     const result6: B[] = Array.from(inputALike); // expect error
diff --git a/tests/baselines/reference/arrayLiterals3.errors.txt b/tests/baselines/reference/arrayLiterals3.errors.txt
index d1c99742a2729..dd4d79d510186 100644
--- a/tests/baselines/reference/arrayLiterals3.errors.txt
+++ b/tests/baselines/reference/arrayLiterals3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(10,5): error TS2322: Type '[]' is not assignable to type '[any, any, any]'.
-  Property '0' is missing in type '[]'.
+  Type '[]' is missing the following properties from type '[any, any, any]': 0, 1, 2
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,38): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,48): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,51): error TS2322: Type 'true' is not assignable to type 'number'.
@@ -7,9 +7,9 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(17,5): error
   Types of property 'length' are incompatible.
     Type '4' is not assignable to type '2'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(32,5): error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
-  Property '0' is missing in type '(number[] | string[])[]'.
+  Type '(number[] | string[])[]' is missing the following properties from type 'tup': 0, 1
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(33,5): error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
-  Property '0' is missing in type 'number[]'.
+  Type 'number[]' is missing the following properties from type '[number, number, number]': 0, 1, 2
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
   Types of property 'pop' are incompatible.
     Type '() => string | number' is not assignable to type '() => Number'.
@@ -30,7 +30,7 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
     var a0: [any, any, any] = [];                             // Error
         ~~
 !!! error TS2322: Type '[]' is not assignable to type '[any, any, any]'.
-!!! error TS2322:   Property '0' is missing in type '[]'.
+!!! error TS2322:   Type '[]' is missing the following properties from type '[any, any, any]': 0, 1, 2
     var a1: [boolean, string, number] = ["string", 1, true];  // Error
                                          ~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'boolean'.
@@ -65,11 +65,11 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
     var c0: tup = [...temp2];                         // Error
         ~~
 !!! error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
-!!! error TS2322:   Property '0' is missing in type '(number[] | string[])[]'.
+!!! error TS2322:   Type '(number[] | string[])[]' is missing the following properties from type 'tup': 0, 1
     var c1: [number, number, number] = [...temp1];    // Error cannot assign number[] to [number, number, number]
         ~~
 !!! error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '0' is missing in type 'number[]'.
+!!! error TS2322:   Type 'number[]' is missing the following properties from type '[number, number, number]': 0, 1, 2
     var c2: myArray = [...temp1, ...temp];            // Error cannot assign (number|string)[] to number[]
         ~~
 !!! error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
diff --git a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
index 66a659b386339..87bafe5889ee0 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(13,1): error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A'.
+    Property 'b' is missing in type A' but present in type 'B'.
 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error TS2322: Type 'C<A>' is not assignable to type 'ReadonlyArray<B>'.
   Types of property 'concat' are incompatible.
     Type '{ (...items: ConcatArray<A>[]): A[]; (...items: (A | ConcatArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ConcatArray<B>[]): B[]; (...items: (B | ConcatArray<B>)[]): B[]; }'.
@@ -25,7 +25,7 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
     ~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A'.
+!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
     
     rra = cra;
     rra = crb; // OK, C<B> is assignable to ReadonlyArray<A>
diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
index f462fd347e6b7..f9528bb0f7eb4 100644
--- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
+++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(7,4): error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
-  Property 'x' is missing in type '(a: any, b: any) => boolean'.
-tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
-  Property 'x' is missing in type '(a: any, b: any) => boolean'.
+tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(7,4): error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
+tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
 
 
 ==== tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts (2 errors) ====
@@ -13,10 +11,8 @@ tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS234
     
     fn((a, b) => true);
        ~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
-!!! error TS2345:   Property 'x' is missing in type '(a: any, b: any) => boolean'.
+!!! error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
     fn(function (a, b) { return true; })
        ~~~~~~~~
-!!! error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
-!!! error TS2345:   Property 'x' is missing in type '(a: any, b: any) => boolean'.
+!!! error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
index bc92c376c7c1d..138b0608e5e6d 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2322: Type 'Object' is not assignable to type 'RegExp'.
   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Property 'exec' is missing in type 'Object'.
+    Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,31): error TS2558: Expected 0 type arguments, but got 1.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,31): error TS2558: Expected 0 type arguments, but got 1.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Type 'Object' is not assignable to type 'Error'.
   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Property 'name' is missing in type 'Object'.
+    Type 'Object' is missing the following properties from type 'Error': name, message
 
 
 ==== tests/cases/compiler/assigningFromObjectToAnythingElse.ts (4 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Ty
     ~
 !!! error TS2322: Type 'Object' is not assignable to type 'RegExp'.
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Property 'exec' is missing in type 'Object'.
+!!! error TS2322:     Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
     
     var a: String = Object.create<Object>("");
                                   ~~~~~~
@@ -28,5 +28,5 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Ty
         ~
 !!! error TS2322: Type 'Object' is not assignable to type 'Error'.
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Property 'name' is missing in type 'Object'.
+!!! error TS2322:     Type 'Object' is missing the following properties from type 'Error': name, message
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompat1.errors.txt b/tests/baselines/reference/assignmentCompat1.errors.txt
index e9fc3bd2f7f52..5398b2509e8d6 100644
--- a/tests/baselines/reference/assignmentCompat1.errors.txt
+++ b/tests/baselines/reference/assignmentCompat1.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/assignmentCompat1.ts(4,1): error TS2322: Type '{ [index: string]: any; }' is not assignable to type '{ one: number; }'.
-  Property 'one' is missing in type '{ [index: string]: any; }'.
+  Property 'one' is missing in type { [index: string]: any; }' but present in type '{ one: number; }'.
 tests/cases/compiler/assignmentCompat1.ts(6,1): error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
-  Property 'one' is missing in type '{ [index: number]: any; }'.
+  Property 'one' is missing in type { [index: number]: any; }' but present in type '{ one: number; }'.
 tests/cases/compiler/assignmentCompat1.ts(8,1): error TS2322: Type '"foo"' is not assignable to type '{ [index: string]: any; }'.
 tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is not assignable to type '{ [index: number]: any; }'.
 
@@ -13,12 +13,12 @@ tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is n
     x = y;  // Error
     ~
 !!! error TS2322: Type '{ [index: string]: any; }' is not assignable to type '{ one: number; }'.
-!!! error TS2322:   Property 'one' is missing in type '{ [index: string]: any; }'.
+!!! error TS2322:   Property 'one' is missing in type { [index: string]: any; }' but present in type '{ one: number; }'.
     y = x;  // Ok because index signature type is any
     x = z;  // Error
     ~
 !!! error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
-!!! error TS2322:   Property 'one' is missing in type '{ [index: number]: any; }'.
+!!! error TS2322:   Property 'one' is missing in type { [index: number]: any; }' but present in type '{ one: number; }'.
     z = x;  // Ok because index signature type is any
     y = "foo"; // Error
     ~
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
index b17973302c612..15cbd2ea15824 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Type 'string | number' is not assignable to type 'number'.
     Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2322: Type '{}[]' is not assignable to type '[{}]'.
-  Property '0' is missing in type '{}[]'.
+  Property '0' is missing in type {}[]' but present in type '[{}]'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts (2 errors) ====
@@ -30,5 +30,5 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     emptyObjTuple = emptyObjArray;
     ~~~~~~~~~~~~~
 !!! error TS2322: Type '{}[]' is not assignable to type '[{}]'.
-!!! error TS2322:   Property '0' is missing in type '{}[]'.
+!!! error TS2322:   Property '0' is missing in type {}[]' but present in type '[{}]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatBug2.errors.txt b/tests/baselines/reference/assignmentCompatBug2.errors.txt
index 29ba96e6586d4..8b0ce8824b092 100644
--- a/tests/baselines/reference/assignmentCompatBug2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBug2.errors.txt
@@ -5,11 +5,11 @@ tests/cases/compiler/assignmentCompatBug2.ts(3,8): error TS2322: Type '{ a: numb
 tests/cases/compiler/assignmentCompatBug2.ts(5,13): error TS2322: Type '{ b: number; a: number; }' is not assignable to type '{ b: number; }'.
   Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }'.
+  Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'g' is missing in type '{ f: (n: number) => number; m: number; }'.
+  Property 'g' is missing in type { f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }'.
+  Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 
 
 ==== tests/cases/compiler/assignmentCompatBug2.ts (6 errors) ====
@@ -39,7 +39,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     b3 = {
     ~~
 !!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }'.
+!!! error TS2322:   Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
     }; // error
@@ -47,7 +47,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     b3 = {
     ~~
 !!! error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'g' is missing in type '{ f: (n: number) => number; m: number; }'.
+!!! error TS2322:   Property 'g' is missing in type { f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         m: 0,
     }; // error
@@ -63,7 +63,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     b3 = {
     ~~
 !!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }'.
+!!! error TS2322:   Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
         n: 0,
diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
index 6686167cf1eae..f40f7a68702ca 100644
--- a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
+++ b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(4,17): error TS2322: Type 'false' is not assignable to type 'string'.
-tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS2345: Argument of type '{ name: string; }' is not assignable to parameter of type '{ id: number; name?: string; }'.
-  Property 'id' is missing in type '{ name: string; }'.
+tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS2737: Property 'id' is missing in type { name: string; }' but present in type '{ id: number; name?: string; }'.
 
 
 ==== tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts (3 errors) ====
@@ -16,5 +15,4 @@ tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS
 !!! related TS6500 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts:1:31: The expected type comes from property 'name' which is declared here on type '{ id: number; name?: string; }'
     foo({ name: "hello" });            // Error, id required but missing
         ~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '{ name: string; }' is not assignable to parameter of type '{ id: number; name?: string; }'.
-!!! error TS2345:   Property 'id' is missing in type '{ name: string; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type { name: string; }' but present in type '{ id: number; name?: string; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
index ffc0fdcd772fa..0b707e0bbd664 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(31,1): error TS2322: Type '() => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '() => number'.
+  Property 'f' is missing in type () => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(32,1): error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: number) => string'.
+  Property 'f' is missing in type (x: number) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(33,1): error TS2322: Type '() => number' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '() => number'.
+  Property 'f' is missing in type () => number' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(34,1): error TS2322: Type '(x: number) => string' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '(x: number) => string'.
+  Property 'f' is missing in type (x: number) => string' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(42,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
@@ -17,9 +17,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(44,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => number'.
+  Property 'f' is missing in type (x: string) => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(45,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => string'.
+  Property 'f' is missing in type (x: string) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(46,1): error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
@@ -31,9 +31,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(48,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '(x: string) => number'.
+  Property 'f' is missing in type (x: string) => number' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '(x: string) => string'.
+  Property 'f' is missing in type (x: string) => string' but present in type '{ f(x: number): void; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts (12 errors) ====
@@ -70,19 +70,19 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '() => number'.
+!!! error TS2322:   Property 'f' is missing in type () => number' but present in type 'T'.
     t = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type 'T'.
     a = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '() => number'.
+!!! error TS2322:   Property 'f' is missing in type () => number' but present in type '{ f(x: number): void; }'.
     a = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type '{ f(x: number): void; }'.
     
     interface S2 {
         f(x: string): void;
@@ -107,11 +107,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type 'T'.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type 'T'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
@@ -129,9 +129,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     a = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type '{ f(x: number): void; }'.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type '{ f(x: number): void; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
index 441810033d262..3ca208e2ba193 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
@@ -36,13 +36,13 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-        Property 'bar' is missing in type 'Base'.
+        Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(80,1): error TS2322: Type '(x: Base[], y: Derived2[]) => Derived[]' is not assignable to type '<T extends Base[]>(x: Base[], y: T) => Derived[]'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type 'Derived2[]'.
       Type 'Base[]' is not assignable to type 'Derived2[]'.
         Type 'Base' is not assignable to type 'Derived2'.
-          Property 'baz' is missing in type 'Base'.
+          Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(83,1): error TS2322: Type '(x: Base[], y: Derived[]) => Derived[]' is not assignable to type '<T extends Derived[]>(x: Base[], y: T) => T'.
   Type 'Derived[]' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(85,1): error TS2322: Type '<T>(x: { a: T; b: T; }) => T' is not assignable to type '(x: { a: string; b: number; }) => Object'.
@@ -184,7 +184,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:         Property 'bar' is missing in type 'Base'.
+!!! error TS2322:         Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
     var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
@@ -194,7 +194,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2[]'.
 !!! error TS2322:       Type 'Base[]' is not assignable to type 'Derived2[]'.
 !!! error TS2322:         Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:           Property 'baz' is missing in type 'Base'.
+!!! error TS2322:           Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
     a13 = b13; // ok
     b13 = a13; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
index 0155b8611c488..d9bfb91081d13 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(23,1): error TS2322: Type '() => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '() => number'.
+  Property 'f' is missing in type () => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(24,1): error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: number) => string'.
+  Property 'f' is missing in type (x: number) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(25,1): error TS2322: Type '() => number' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '() => number'.
+  Property 'f' is missing in type () => number' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(26,1): error TS2322: Type '(x: number) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '(x: number) => string'.
+  Property 'f' is missing in type (x: number) => string' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(34,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
@@ -15,9 +15,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(36,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => number'.
+  Property 'f' is missing in type (x: string) => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(37,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => string'.
+  Property 'f' is missing in type (x: string) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(38,1): error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
@@ -27,9 +27,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(40,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '(x: string) => number'.
+  Property 'f' is missing in type (x: string) => number' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(41,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '(x: string) => string'.
+  Property 'f' is missing in type (x: string) => string' but present in type '{ f: new (x: number) => void; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts (12 errors) ====
@@ -58,19 +58,19 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '() => number'.
+!!! error TS2322:   Property 'f' is missing in type () => number' but present in type 'T'.
     t = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type 'T'.
     a = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '() => number'.
+!!! error TS2322:   Property 'f' is missing in type () => number' but present in type '{ f: new (x: number) => void; }'.
     a = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type '{ f: new (x: number) => void; }'.
     
     interface S2 {
         f(x: string): void;
@@ -93,11 +93,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type 'T'.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type 'T'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
@@ -113,9 +113,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     a = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type '{ f: new (x: number) => void; }'.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string'.
+!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type '{ f: new (x: number) => void; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
index 3bce93635d07d..a5cda1700a7d1 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
@@ -36,13 +36,13 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-        Property 'bar' is missing in type 'Base'.
+        Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(80,1): error TS2322: Type 'new (x: Base[], y: Derived2[]) => Derived[]' is not assignable to type 'new <T extends Base[]>(x: Base[], y: T) => Derived[]'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type 'Derived2[]'.
       Type 'Base[]' is not assignable to type 'Derived2[]'.
         Type 'Base' is not assignable to type 'Derived2'.
-          Property 'baz' is missing in type 'Base'.
+          Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(83,1): error TS2322: Type 'new (x: Base[], y: Derived[]) => Derived[]' is not assignable to type 'new <T extends Derived[]>(x: Base[], y: T) => T'.
   Type 'Derived[]' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(85,1): error TS2322: Type 'new <T>(x: { a: T; b: T; }) => T' is not assignable to type 'new (x: { a: string; b: number; }) => Object'.
@@ -184,7 +184,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:         Property 'bar' is missing in type 'Base'.
+!!! error TS2322:         Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
     var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
@@ -194,7 +194,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2[]'.
 !!! error TS2322:       Type 'Base[]' is not assignable to type 'Derived2[]'.
 !!! error TS2322:         Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:           Property 'baz' is missing in type 'Base'.
+!!! error TS2322:           Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
     a13 = b13; // ok
     b13 = a13; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
index c5987a93ddf7f..b23274cb2466d 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(14,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+      Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(18,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
+      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(32,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -41,7 +41,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base'.
+!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
@@ -50,7 +50,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Base'.
+!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         class A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
index f91d0dd0c1505..3d1f92a254f62 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(14,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+      Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(18,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
+      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(32,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -41,7 +41,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base'.
+!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
@@ -50,7 +50,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Base'.
+!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         interface A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
index 61f9e082a481c..34a2aee6b7054 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(14,1): error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+      Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(23,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Derived'.
+      Property 'baz' is missing in type Derived' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -30,7 +30,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base'.
+!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
     b = a; // ok
     
     class B2 extends A {
@@ -44,7 +44,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Derived' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Derived'.
+!!! error TS2322:       Property 'baz' is missing in type Derived' but present in type 'Derived2'.
     
     module Generics {
         class A<T extends Derived> {
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
index 0fdae0b7cfa30..772b9348140e3 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(24,5): error TS2322: Type 'T' is not assignable to type 'S'.
   Types of property 'foo' are incompatible.
     Type 'Derived2' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Derived2'.
+      Property 'bar' is missing in type Derived2' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(25,5): error TS2322: Type 'S' is not assignable to type 'T'.
   Types of property 'foo' are incompatible.
     Type 'Derived' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Derived'.
+      Property 'baz' is missing in type Derived' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(29,5): error TS2322: Type 'T2' is not assignable to type 'S2'.
   Types of property 'foo' are incompatible.
     Type 'Derived2' is not assignable to type 'Derived'.
@@ -42,7 +42,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(70,5): error TS2322: Type 'S' is not assignable to type 'T'.
   Types of property 'foo' are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
+      Property 'baz' is missing in type Base' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(75,5): error TS2322: Type 'S2' is not assignable to type 'T2'.
   Types of property 'foo' are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -83,13 +83,13 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'T' is not assignable to type 'S'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'Derived2' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Derived2'.
+!!! error TS2322:       Property 'bar' is missing in type Derived2' but present in type 'Derived'.
         t = s; // error
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'Derived' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Derived'.
+!!! error TS2322:       Property 'baz' is missing in type Derived' but present in type 'Derived2'.
         s = s2; // ok
         s = a2; // ok
     
@@ -183,7 +183,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Base'.
+!!! error TS2322:       Property 'baz' is missing in type Base' but present in type 'Derived2'.
         s = s2; // ok
         s = a2; // ok
     
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
index f9f7e48c68549..dcdac53dde3e0 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(13,1): error TS2322: Type 'I' is not assignable to type 'C'.
-  Property 'foo' is missing in type 'I'.
+  Property 'foo' is missing in type I' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(14,1): error TS2322: Type 'C' is not assignable to type 'I'.
-  Property 'fooo' is missing in type 'C'.
+  Property 'fooo' is missing in type C' but present in type 'I'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts (2 errors) ====
@@ -20,8 +20,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     c = i; // error
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
-!!! error TS2322:   Property 'foo' is missing in type 'I'.
+!!! error TS2322:   Property 'foo' is missing in type I' but present in type 'C'.
     i = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'I'.
-!!! error TS2322:   Property 'fooo' is missing in type 'C'.
\ No newline at end of file
+!!! error TS2322:   Property 'fooo' is missing in type C' but present in type 'I'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
index 0d7fe1071e919..48055cdbf8df5 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
@@ -8,23 +8,23 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(41,5): error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(74,5): error TS2322: Type 'D' is not assignable to type 'C'.
-  Property 'opt' is missing in type 'D'.
+  Property 'opt' is missing in type D' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(75,5): error TS2322: Type 'E' is not assignable to type 'C'.
-  Property 'opt' is missing in type 'E'.
+  Property 'opt' is missing in type E' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(76,5): error TS2322: Type 'F' is not assignable to type 'C'.
-  Property 'opt' is missing in type 'F'.
+  Property 'opt' is missing in type F' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(79,5): error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'D'.
+  Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(80,5): error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'E'.
+  Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(81,5): error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'F'.
+  Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(84,5): error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'D'.
+  Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(85,5): error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'E'.
+  Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'F'.
+  Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts (18 errors) ====
@@ -122,43 +122,43 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         c = d; // error
         ~
 !!! error TS2322: Type 'D' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type 'D'.
+!!! error TS2322:   Property 'opt' is missing in type D' but present in type 'C'.
         c = e; // error
         ~
 !!! error TS2322: Type 'E' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type 'E'.
+!!! error TS2322:   Property 'opt' is missing in type E' but present in type 'C'.
         c = f; // error
         ~
 !!! error TS2322: Type 'F' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type 'F'.
+!!! error TS2322:   Property 'opt' is missing in type F' but present in type 'C'.
         c = a; // ok
     
         a = d; // error
         ~
 !!! error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'D'.
+!!! error TS2322:   Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
         a = e; // error
         ~
 !!! error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'E'.
+!!! error TS2322:   Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
         a = f; // error
         ~
 !!! error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'F'.
+!!! error TS2322:   Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
         a = c; // ok
     
         b = d; // error
         ~
 !!! error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'D'.
+!!! error TS2322:   Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
         b = e; // error
         ~
 !!! error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'E'.
+!!! error TS2322:   Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
         b = f; // error
         ~
 !!! error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'F'.
+!!! error TS2322:   Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
         b = a; // ok
         b = c; // ok
     }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
index d86c73f5cf836..65fcacc51964e 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
@@ -1,61 +1,61 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(21,5): error TS2322: Type 'T' is not assignable to type 'S'.
-  Property ''1'' is missing in type 'T'.
+  Property ''1'' is missing in type T' but present in type 'S'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(22,5): error TS2322: Type 'S' is not assignable to type 'T'.
-  Property ''1.'' is missing in type 'S'.
+  Property ''1.'' is missing in type S' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(24,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-  Property ''1'' is missing in type '{ '1.0': string; }'.
+  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(26,5): error TS2322: Type 'T2' is not assignable to type 'S2'.
-  Property ''1'' is missing in type 'T2'.
+  Property ''1'' is missing in type T2' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(27,5): error TS2322: Type 'S2' is not assignable to type 'T2'.
-  Property ''1.0'' is missing in type 'S2'.
+  Property ''1.0'' is missing in type S2' but present in type 'T2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(28,5): error TS2322: Type 'T' is not assignable to type 'S2'.
-  Property ''1'' is missing in type 'T'.
+  Property ''1'' is missing in type T' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(29,5): error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type '{ '1.0': string; baz?: string; }'.
+  Property ''1'' is missing in type { '1.0': string; baz?: string; }' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(30,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type '{ '1.0': string; }'.
+  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(32,5): error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }'.
+  Property ''1.'' is missing in type { '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(33,5): error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ '1.0': string; baz?: string; }'.
-  Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }'.
+  Property ''1.0'' is missing in type { '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(34,5): error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S'.
+  Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(35,5): error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S2'.
+  Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(36,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ '1.0': string; }'.
+  Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(38,5): error TS2322: Type '{ '1': string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type '{ '1': string; }'.
+  Property ''1.0'' is missing in type { '1': string; }' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(39,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1': string; }'.
-  Property ''1'' is missing in type '{ '1.0': string; }'.
+  Property ''1'' is missing in type { '1.0': string; }' but present in type '{ '1': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(42,5): error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type 'T'.
+  Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(65,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-  Property ''1'' is missing in type '{ '1.0': string; }'.
+  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(71,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type '{ '1.0': string; }'.
+  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(73,5): error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }'.
+  Property ''1.'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(74,5): error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ 1.0: string; baz?: string; }'.
-  Property '1.0' is missing in type '{ '1.': string; bar?: string; }'.
+  Property '1.0' is missing in type { '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(75,5): error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S'.
+  Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(76,5): error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S2'.
+  Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(77,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ '1.0': string; }'.
+  Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(78,5): error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ 1.: string; }'.
+  Property ''1.'' is missing in type { 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(80,5): error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type '{ 1.: string; }'.
+  Property ''1.0'' is missing in type { 1.: string; }' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(81,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ 1.: string; }'.
-  Property '1.' is missing in type '{ '1.0': string; }'.
+  Property '1.' is missing in type { '1.0': string; }' but present in type '{ 1.: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(82,5): error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }'.
+  Property ''1.0'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(83,5): error TS2322: Type 'T2' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type 'T2'.
+  Property ''1.0'' is missing in type T2' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type 'T'.
+  Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts (29 errors) ====
@@ -82,73 +82,73 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = t;
         ~
 !!! error TS2322: Type 'T' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type 'T'.
+!!! error TS2322:   Property ''1'' is missing in type T' but present in type 'S'.
         t = s;
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S'.
+!!! error TS2322:   Property ''1.'' is missing in type S' but present in type 'T'.
         s = s2; // ok
         s = a2;
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
     
         s2 = t2;
         ~~
 !!! error TS2322: Type 'T2' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type 'T2'.
+!!! error TS2322:   Property ''1'' is missing in type T2' but present in type 'S2'.
         t2 = s2;
         ~~
 !!! error TS2322: Type 'S2' is not assignable to type 'T2'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'S2'.
+!!! error TS2322:   Property ''1.0'' is missing in type S2' but present in type 'T2'.
         s2 = t;
         ~~
 !!! error TS2322: Type 'T' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type 'T'.
+!!! error TS2322:   Property ''1'' is missing in type T' but present in type 'S2'.
         s2 = b;
         ~~
 !!! error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; baz?: string; }'.
+!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; baz?: string; }' but present in type 'S2'.
         s2 = a2;
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
     
         a = b;
         ~
 !!! error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type { '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
         b = a;
         ~
 !!! error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ '1.0': string; baz?: string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type { '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
         a = s;
         ~
 !!! error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S'.
+!!! error TS2322:   Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
         a = s2;
         ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S2'.
+!!! error TS2322:   Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
         a = a2;
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
     
         a2 = b2;
         ~~
 !!! error TS2322: Type '{ '1': string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ '1': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type { '1': string; }' but present in type '{ '1.0': string; }'.
         b2 = a2;
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1': string; }'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type '{ '1': string; }'.
         a2 = b; // ok
         a2 = t2; // ok
         a2 = t;
         ~~
 !!! error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'T'.
+!!! error TS2322:   Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
     }
     
     module NumbersAndStrings {
@@ -174,7 +174,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = a2; // error
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
     
         s2 = t2; // ok
         t2 = s2; // ok
@@ -183,51 +183,51 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s2 = a2; // error
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
     
         a = b; // error
         ~
 !!! error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
         b = a; // error
         ~
 !!! error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ 1.0: string; baz?: string; }'.
-!!! error TS2322:   Property '1.0' is missing in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property '1.0' is missing in type { '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
         a = s; // error
         ~
 !!! error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S'.
+!!! error TS2322:   Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
         a = s2; // error
         ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S2'.
+!!! error TS2322:   Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
         a = a2; // error
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
         a = b2; // error
         ~
 !!! error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ 1.: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type { 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
     
         a2 = b2; // error
         ~~
 !!! error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ 1.: string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type { 1.: string; }' but present in type '{ '1.0': string; }'.
         b2 = a2; // error
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ 1.: string; }'.
-!!! error TS2322:   Property '1.' is missing in type '{ '1.0': string; }'.
+!!! error TS2322:   Property '1.' is missing in type { '1.0': string; }' but present in type '{ 1.: string; }'.
         a2 = b; // error
         ~~
 !!! error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
         a2 = t2; // error
         ~~
 !!! error TS2322: Type 'T2' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'T2'.
+!!! error TS2322:   Property ''1.0'' is missing in type T2' but present in type '{ '1.0': string; }'.
         a2 = t; // error
         ~~
 !!! error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'T'.
+!!! error TS2322:   Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
index 51762bb941834..8304e9597516e 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(15,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+      Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(19,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
+      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(33,5): error TS2322: Type 'A<Base>' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
@@ -48,7 +48,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base'.
+!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
@@ -57,7 +57,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Base'.
+!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         class A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
index 0b0d70d01bb51..d820a71af3be0 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(15,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+      Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(19,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
+      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(33,5): error TS2322: Type 'A<Base>' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
@@ -48,7 +48,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base'.
+!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
@@ -57,7 +57,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Base'.
+!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         interface A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
index e9adcba03b73b..59055a08741ee 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
@@ -1,14 +1,13 @@
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(10,1): error TS2322: Type '""' is not assignable to type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type 'string[]'.
+  Property 'apply' is missing in type string[]' but present in type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(12,1): error TS2322: Type '4' is not assignable to type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type '{}'.
+  Property 'apply' is missing in type {}' but present in type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
-tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(25,4): error TS2345: Argument of type '{}' is not assignable to parameter of type 'Applicable'.
-  Property 'apply' is missing in type '{}'.
+tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(25,4): error TS2737: Property 'apply' is missing in type {}' but present in type 'Applicable'.
 
 
 ==== tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts (8 errors) ====
@@ -27,14 +26,14 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
     x = [''];
     ~
 !!! error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type 'string[]'.
+!!! error TS2322:   Property 'apply' is missing in type string[]' but present in type 'Applicable'.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Applicable'.
     x = {};
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type '{}'.
+!!! error TS2322:   Property 'apply' is missing in type {}' but present in type 'Applicable'.
     
     // Should work
     function f() { };
@@ -54,8 +53,7 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
     fn({});
        ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'Applicable'.
-!!! error TS2345:   Property 'apply' is missing in type '{}'.
+!!! error TS2737: Property 'apply' is missing in type {}' but present in type 'Applicable'.
     
     
     // Should work
diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
index 1755630217870..c6099d3d2ddcb 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
@@ -1,14 +1,13 @@
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(10,1): error TS2322: Type '""' is not assignable to type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Callable'.
-  Property 'call' is missing in type 'string[]'.
+  Property 'call' is missing in type string[]' but present in type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(12,1): error TS2322: Type '4' is not assignable to type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Callable'.
-  Property 'call' is missing in type '{}'.
+  Property 'call' is missing in type {}' but present in type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
-tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(25,4): error TS2345: Argument of type '{}' is not assignable to parameter of type 'Callable'.
-  Property 'call' is missing in type '{}'.
+tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(25,4): error TS2737: Property 'call' is missing in type {}' but present in type 'Callable'.
 
 
 ==== tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts (8 errors) ====
@@ -27,14 +26,14 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
     x = [''];
     ~
 !!! error TS2322: Type 'string[]' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type 'string[]'.
+!!! error TS2322:   Property 'call' is missing in type string[]' but present in type 'Callable'.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Callable'.
     x = {};
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type '{}'.
+!!! error TS2322:   Property 'call' is missing in type {}' but present in type 'Callable'.
     
     // Should work
     function f() { };
@@ -54,8 +53,7 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
     fn({});
        ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'Callable'.
-!!! error TS2345:   Property 'call' is missing in type '{}'.
+!!! error TS2737: Property 'call' is missing in type {}' but present in type 'Callable'.
     
     
     // Should work
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
index 9e28f5e917782..31ea9c7116069 100644
--- a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
+++ b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/assignmentToObjectAndFunction.ts(1,24): error TS2322: Type 'number' is not assignable to type '() => string'.
 tests/cases/compiler/assignmentToObjectAndFunction.ts(8,5): error TS2322: Type '{}' is not assignable to type 'Function'.
-  Property 'apply' is missing in type '{}'.
+  Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
 tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type 'typeof bad' is not assignable to type 'Function'.
   Types of property 'apply' are incompatible.
     Type 'number' is not assignable to type '(this: Function, thisArg: any, argArray?: any) => any'.
@@ -19,7 +19,7 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type
     var errFun: Function = {}; // Error for no call signature
         ~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'Function'.
-!!! error TS2322:   Property 'apply' is missing in type '{}'.
+!!! error TS2322:   Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
     
     function foo() { }
     module foo {
diff --git a/tests/baselines/reference/bases.errors.txt b/tests/baselines/reference/bases.errors.txt
index 3069f977fe12c..92fa723ad5300 100644
--- a/tests/baselines/reference/bases.errors.txt
+++ b/tests/baselines/reference/bases.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/bases.ts(7,14): error TS2339: Property 'y' does not exist o
 tests/cases/compiler/bases.ts(7,15): error TS1005: ';' expected.
 tests/cases/compiler/bases.ts(7,17): error TS2693: 'any' only refers to a type, but is being used as a value here.
 tests/cases/compiler/bases.ts(11,7): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property 'x' is missing in type 'C'.
+  Property 'x' is missing in type C' but present in type 'I'.
 tests/cases/compiler/bases.ts(12,5): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/bases.ts(13,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/bases.ts(13,14): error TS2339: Property 'x' does not exist on type 'C'.
@@ -32,7 +32,7 @@ tests/cases/compiler/bases.ts(18,9): error TS2339: Property 'y' does not exist o
     class C extends B implements I {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'x' is missing in type 'C'.
+!!! error TS2420:   Property 'x' is missing in type C' but present in type 'I'.
         constructor() {
         ~~~~~~~~~~~~~~~
             this.x: any;
diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt
index b9e28711715a0..bb7c85ea9a4c4 100644
--- a/tests/baselines/reference/bluebirdStaticThis.errors.txt
+++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/bluebirdStaticThis.ts(5,22): error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
-  Property 'then' is missing in type 'Promise<R>'.
+  Property 'then' is missing in type Promise<R>' but present in type 'Thenable<R>'.
 tests/cases/compiler/bluebirdStaticThis.ts(22,51): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Resolver'.
 tests/cases/compiler/bluebirdStaticThis.ts(57,109): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'.
 tests/cases/compiler/bluebirdStaticThis.ts(58,91): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'.
@@ -15,7 +15,7 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace '"tes
     export declare class Promise<R> implements Promise.Thenable<R> {
                          ~~~~~~~
 !!! error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
-!!! error TS2420:   Property 'then' is missing in type 'Promise<R>'.
+!!! error TS2420:   Property 'then' is missing in type Promise<R>' but present in type 'Thenable<R>'.
     	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
         static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
         static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
diff --git a/tests/baselines/reference/castingTuple.errors.txt b/tests/baselines/reference/castingTuple.errors.txt
index 08e2b32a8583a..40c6758207340 100644
--- a/tests/baselines/reference/castingTuple.errors.txt
+++ b/tests/baselines/reference/castingTuple.errors.txt
@@ -1,17 +1,14 @@
-tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property '2' is missing in type '[number, string]'.
+tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2737: Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(14,15): error TS2352: Conversion of type '[number, string, boolean]' to type '[number, string]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Types of property 'length' are incompatible.
     Type '3' is not comparable to type '2'.
 tests/cases/conformance/types/tuple/castingTuple.ts(15,14): error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-tests/cases/conformance/types/tuple/castingTuple.ts(18,21): error TS2352: Conversion of type '[C, D]' to type '[C, D, A]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property '2' is missing in type '[C, D]'.
+tests/cases/conformance/types/tuple/castingTuple.ts(18,21): error TS2737: Property '2' is missing in type [C, D]' but present in type '[C, D, A]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(20,33): error TS2339: Property '5' does not exist on type '[C, D, A]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(30,10): error TS2352: Conversion of type '[number, string]' to type '[number, number]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Type 'string' is not comparable to type 'number'.
 tests/cases/conformance/types/tuple/castingTuple.ts(31,10): error TS2352: Conversion of type '[C, D]' to type '[A, I]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Type 'C' is not comparable to type 'A'.
-    Property 'a' is missing in type 'C'.
+  Property 'a' is missing in type C' but present in type 'A'.
 tests/cases/conformance/types/tuple/castingTuple.ts(32,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot find name 't4'.
 
@@ -31,8 +28,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var emptyObjTuple = <[{}, {}]>numStrTuple;
     var numStrBoolTuple = <[number, string, boolean]>numStrTuple;
                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property '2' is missing in type '[number, string]'.
+!!! error TS2737: Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
     var shorter = numStrBoolTuple as [number, string]
                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type '[number, string, boolean]' to type '[number, string]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
@@ -45,8 +41,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var interfaceIITuple = <[I, I]>classCDTuple;
     var classCDATuple = <[C, D, A]>classCDTuple;
                         ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type '[C, D]' to type '[C, D, A]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property '2' is missing in type '[C, D]'.
+!!! error TS2737: Property '2' is missing in type [C, D]' but present in type '[C, D, A]'.
     var eleFromCDA1 = classCDATuple[2]; // A
     var eleFromCDA2 = classCDATuple[5]; // C | D | A
                                     ~
@@ -67,8 +62,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var t9 = <[A, I]>classCDTuple;
              ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type '[C, D]' to type '[A, I]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Type 'C' is not comparable to type 'A'.
-!!! error TS2352:     Property 'a' is missing in type 'C'.
+!!! error TS2352:   Property 'a' is missing in type C' but present in type 'A'.
     var array1 = <number[]>numStrTuple;
         ~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
diff --git a/tests/baselines/reference/chainedAssignment1.errors.txt b/tests/baselines/reference/chainedAssignment1.errors.txt
index 3fa654c62cc3e..e6fdbd58026e0 100644
--- a/tests/baselines/reference/chainedAssignment1.errors.txt
+++ b/tests/baselines/reference/chainedAssignment1.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/chainedAssignment1.ts(21,1): error TS2322: Type 'Z' is not assignable to type 'X'.
-  Property 'a' is missing in type 'Z'.
+  Property 'a' is missing in type Z' but present in type 'X'.
 tests/cases/compiler/chainedAssignment1.ts(21,6): error TS2322: Type 'Z' is not assignable to type 'Y'.
-  Property 'a' is missing in type 'Z'.
+  Type 'Z' is missing the following properties from type 'Y': a, b
 tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not assignable to type 'Y'.
 
 
@@ -29,10 +29,10 @@ tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not
     c1 = c2 = c3; // a bug made this not report the same error as below
     ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'X'.
-!!! error TS2322:   Property 'a' is missing in type 'Z'.
+!!! error TS2322:   Property 'a' is missing in type Z' but present in type 'X'.
          ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'Y'.
-!!! error TS2322:   Property 'a' is missing in type 'Z'.
+!!! error TS2322:   Type 'Z' is missing the following properties from type 'Y': a, b
     c2 = c3; // Error TS111: Cannot convert Z to Y
     ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'Y'.
\ No newline at end of file
diff --git a/tests/baselines/reference/chainedAssignment3.errors.txt b/tests/baselines/reference/chainedAssignment3.errors.txt
index 8a64a35cbc08a..e556cfb65e843 100644
--- a/tests/baselines/reference/chainedAssignment3.errors.txt
+++ b/tests/baselines/reference/chainedAssignment3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/chainedAssignment3.ts(18,1): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'value' is missing in type 'A'.
+  Property 'value' is missing in type A' but present in type 'B'.
 tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not assignable to type 'B'.
 
 
@@ -24,7 +24,7 @@ tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not
     b = a = new A();
     ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'value' is missing in type 'A'.
+!!! error TS2322:   Property 'value' is missing in type A' but present in type 'B'.
     a = b = new A();
         ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
diff --git a/tests/baselines/reference/chainedAssignmentChecking.errors.txt b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
index ac3bade0aaeb9..0bb93671f7912 100644
--- a/tests/baselines/reference/chainedAssignmentChecking.errors.txt
+++ b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/chainedAssignmentChecking.ts(21,1): error TS2322: Type 'Z' is not assignable to type 'X'.
-  Property 'a' is missing in type 'Z'.
+  Property 'a' is missing in type Z' but present in type 'X'.
 tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2322: Type 'Z' is not assignable to type 'Y'.
-  Property 'a' is missing in type 'Z'.
+  Type 'Z' is missing the following properties from type 'Y': a, b
 
 
 ==== tests/cases/compiler/chainedAssignmentChecking.ts (2 errors) ====
@@ -28,8 +28,8 @@ tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2322: Type 'Z'
     c1 = c2 = c3; // Should be error
     ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'X'.
-!!! error TS2322:   Property 'a' is missing in type 'Z'.
+!!! error TS2322:   Property 'a' is missing in type Z' but present in type 'X'.
          ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'Y'.
-!!! error TS2322:   Property 'a' is missing in type 'Z'.
+!!! error TS2322:   Type 'Z' is missing the following properties from type 'Y': a, b
     
\ No newline at end of file
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
index cee9236d630ca..262bdb438d72a 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,64): error TS2322: Type 'B' is not assignable to type 'C'.
-  Property 'z' is missing in type 'B'.
+  Property 'z' is missing in type B' but present in type 'C'.
 
 
 ==== tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts (1 errors) ====
@@ -24,5 +24,5 @@ tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParamete
     (new Chain(new A)).then(a => new B).then(b => new C).then(c => new B).then(b => new A);
                                                                    ~~~~~
 !!! error TS2322: Type 'B' is not assignable to type 'C'.
-!!! error TS2322:   Property 'z' is missing in type 'B'.
+!!! error TS2322:   Property 'z' is missing in type B' but present in type 'C'.
 !!! 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/checkJsdocTypeTag6.errors.txt b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
index cc86b6115aff0..4b4f3f037b10c 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
+++ b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsdoc/test.js(1,5): error TS8030: The type of a function declaration must match the function's signature.
 tests/cases/conformance/jsdoc/test.js(7,5): error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
-  Property 'prop' is missing in type '(prop: any) => void'.
+  Property 'prop' is missing in type (prop: any) => void' but present in type '{ prop: string; }'.
 tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a function declaration must match the function's signature.
 
 
@@ -16,7 +16,7 @@ tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a functio
     var g = function (prop) {
         ~
 !!! error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
-!!! error TS2322:   Property 'prop' is missing in type '(prop: any) => void'.
+!!! error TS2322:   Property 'prop' is missing in type (prop: any) => void' but present in type '{ prop: string; }'.
     }
     
     /** @type {(a: number) => number} */
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
index 6878372be8b4c..b730f2d6d0b2e 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/jsx/file.tsx(42,11): error TS2322: Type '{ children: Ele
   Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'SingleChildProp'.
     Types of property 'children' are incompatible.
       Type 'Element[]' is not assignable to type 'Element'.
-        Property 'type' is missing in type 'Element[]'.
+        Type 'Element[]' is missing the following properties from type 'Element': type, props
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -53,4 +53,4 @@ tests/cases/conformance/jsx/file.tsx(42,11): error TS2322: Type '{ children: Ele
 !!! error TS2322:   Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'SingleChildProp'.
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type 'Element[]' is not assignable to type 'Element'.
-!!! error TS2322:         Property 'type' is missing in type 'Element[]'.
\ No newline at end of file
+!!! error TS2322:         Type 'Element[]' is missing the following properties from type 'Element': type, props
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
index 5ecc37c6045de..81606fe1b4d6b 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
@@ -1,31 +1,31 @@
 tests/cases/conformance/jsx/file.tsx(14,10): error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-    Property 'children' is missing in type '{ a: number; b: string; }'.
+    Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
 tests/cases/conformance/jsx/file.tsx(17,11): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
 tests/cases/conformance/jsx/file.tsx(31,6): error TS2322: Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
         Type '(Element | ((name: string) => Element))[]' is not assignable to type 'Element'.
-          Property 'type' is missing in type '(Element | ((name: string) => Element))[]'.
+          Type '(Element | ((name: string) => Element))[]' is missing the following properties from type 'Element': type, props
 tests/cases/conformance/jsx/file.tsx(37,6): error TS2322: Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type '(number | Element)[]' is not assignable to type 'string | Element'.
         Type '(number | Element)[]' is not assignable to type 'Element'.
-          Property 'type' is missing in type '(number | Element)[]'.
+          Type '(number | Element)[]' is missing the following properties from type 'Element': type, props
 tests/cases/conformance/jsx/file.tsx(43,6): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type '(string | Element)[]' is not assignable to type 'string | Element'.
         Type '(string | Element)[]' is not assignable to type 'Element'.
-          Property 'type' is missing in type '(string | Element)[]'.
+          Type '(string | Element)[]' is missing the following properties from type 'Element': type, props
 tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type 'Element[]' is not assignable to type 'string | Element'.
         Type 'Element[]' is not assignable to type 'Element'.
-          Property 'type' is missing in type 'Element[]'.
+          Type 'Element[]' is missing the following properties from type 'Element': type, props
 
 
 ==== tests/cases/conformance/jsx/file.tsx (6 errors) ====
@@ -46,7 +46,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
              ~~~~
 !!! error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
 !!! error TS2322:   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'children' is missing in type '{ a: number; b: string; }'.
+!!! error TS2322:     Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
     
     let k0 =
         <Comp a={10} b="hi" children="Random" >
@@ -72,7 +72,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
 !!! error TS2322:         Type '(Element | ((name: string) => Element))[]' is not assignable to type 'Element'.
-!!! error TS2322:           Property 'type' is missing in type '(Element | ((name: string) => Element))[]'.
+!!! error TS2322:           Type '(Element | ((name: string) => Element))[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             {(name: string) => <div> My name {name} </div>}
         </Comp>;
@@ -85,7 +85,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type '(number | Element)[]' is not assignable to type 'string | Element'.
 !!! error TS2322:         Type '(number | Element)[]' is not assignable to type 'Element'.
-!!! error TS2322:           Property 'type' is missing in type '(number | Element)[]'.
+!!! error TS2322:           Type '(number | Element)[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             {1000000}
         </Comp>;
@@ -98,7 +98,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'string | Element'.
 !!! error TS2322:         Type '(string | Element)[]' is not assignable to type 'Element'.
-!!! error TS2322:           Property 'type' is missing in type '(string | Element)[]'.
+!!! error TS2322:           Type '(string | Element)[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             hi hi hi!
         </Comp>;
@@ -111,7 +111,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type 'Element[]' is not assignable to type 'string | Element'.
 !!! error TS2322:         Type 'Element[]' is not assignable to type 'Element'.
-!!! error TS2322:           Property 'type' is missing in type 'Element[]'.
+!!! error TS2322:           Type 'Element[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             <div> My Div </div>
         </Comp>;
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
index 14307fbb42c73..42c7eda8a4c29 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
@@ -1,16 +1,16 @@
 tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-    Property 'children' is missing in type '{ a: number; b: string; }'.
+    Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
 tests/cases/conformance/jsx/file.tsx(24,6): error TS2322: Type '{ children: Element; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type 'Element' is not assignable to type 'Button'.
-        Property 'render' is missing in type 'Element'.
+        Type 'Element' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
 tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type 'typeof Button' is not assignable to type 'Button'.
-        Property 'render' is missing in type 'typeof Button'.
+        Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -37,7 +37,7 @@ tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: type
              ~~~~
 !!! error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
 !!! error TS2322:   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'children' is missing in type '{ a: number; b: string; }'.
+!!! error TS2322:     Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
     
     // Error: JSX.element is not the same as JSX.ElementClass
     let k1 =
@@ -47,7 +47,7 @@ tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: type
 !!! error TS2322:   Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type 'Element' is not assignable to type 'Button'.
-!!! error TS2322:         Property 'render' is missing in type 'Element'.
+!!! error TS2322:         Type 'Element' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
             <Button />
         </Comp>;
     let k2 =
@@ -57,6 +57,6 @@ tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: type
 !!! error TS2322:   Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'Prop'.
 !!! error TS2322:     Types of property 'children' are incompatible.
 !!! error TS2322:       Type 'typeof Button' is not assignable to type 'Button'.
-!!! error TS2322:         Property 'render' is missing in type 'typeof Button'.
+!!! error TS2322:         Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
             {Button}
         </Comp>;
\ No newline at end of file
diff --git a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
index 12dacb9efde54..92cdc904c2212 100644
--- a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
+++ b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
@@ -10,8 +10,7 @@ tests/cases/conformance/salsa/second.ts(14,7): error TS2417: Class static side '
     Type '(others: (typeof Wagon)[]) => number' is not assignable to type '(wagons?: Wagon[]) => number'.
       Types of parameters 'others' and 'wagons' are incompatible.
         Type 'Wagon[]' is not assignable to type '(typeof Wagon)[]'.
-          Type 'Wagon' is not assignable to type 'typeof Wagon'.
-            Property 'circle' is missing in type 'Wagon'.
+          Property 'circle' is missing in type Wagon' but present in type 'typeof Wagon'.
 tests/cases/conformance/salsa/second.ts(17,15): error TS2345: Argument of type '"nope"' is not assignable to parameter of type 'number'.
 
 
@@ -97,8 +96,7 @@ tests/cases/conformance/salsa/second.ts(17,15): error TS2345: Argument of type '
 !!! error TS2417:     Type '(others: (typeof Wagon)[]) => number' is not assignable to type '(wagons?: Wagon[]) => number'.
 !!! error TS2417:       Types of parameters 'others' and 'wagons' are incompatible.
 !!! error TS2417:         Type 'Wagon[]' is not assignable to type '(typeof Wagon)[]'.
-!!! error TS2417:           Type 'Wagon' is not assignable to type 'typeof Wagon'.
-!!! error TS2417:             Property 'circle' is missing in type 'Wagon'.
+!!! error TS2417:           Property 'circle' is missing in type Wagon' but present in type 'typeof Wagon'.
         constructor(public drunkOO: true) {
             // error: wrong type
             super('nope');
diff --git a/tests/baselines/reference/classImplementsClass2.errors.txt b/tests/baselines/reference/classImplementsClass2.errors.txt
index 4d82142e5ba3b..f67527d46cf0f 100644
--- a/tests/baselines/reference/classImplementsClass2.errors.txt
+++ b/tests/baselines/reference/classImplementsClass2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/classImplementsClass2.ts(2,7): error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-  Property 'foo' is missing in type 'C'.
+  Property 'foo' is missing in type C' but present in type 'A'.
 tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is not assignable to type 'C2'.
-  Property 'foo' is missing in type 'C'.
+  Property 'foo' is missing in type C' but present in type 'C2'.
 
 
 ==== tests/cases/compiler/classImplementsClass2.ts (2 errors) ====
@@ -9,7 +9,7 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is n
     class C implements A {} // error
           ~
 !!! error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-!!! error TS2720:   Property 'foo' is missing in type 'C'.
+!!! error TS2720:   Property 'foo' is missing in type C' but present in type 'A'.
     
     class C2 extends A {
         foo() {
@@ -23,4 +23,4 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is n
     c2 = c;
     ~~
 !!! error TS2322: Type 'C' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'foo' is missing in type 'C'.
\ No newline at end of file
+!!! error TS2322:   Property 'foo' is missing in type C' but present in type 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass4.errors.txt b/tests/baselines/reference/classImplementsClass4.errors.txt
index 2ac005ca40a79..bb9d8833a3b1e 100644
--- a/tests/baselines/reference/classImplementsClass4.errors.txt
+++ b/tests/baselines/reference/classImplementsClass4.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/classImplementsClass4.ts(5,7): error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-  Property 'x' is missing in type 'C'.
+  Property 'x' is missing in type C' but present in type 'A'.
 tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is not assignable to type 'C2'.
-  Property 'x' is missing in type 'C'.
+  Property 'x' is missing in type C' but present in type 'C2'.
 
 
 ==== tests/cases/compiler/classImplementsClass4.ts (2 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is n
     class C implements A {
           ~
 !!! error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type 'C'.
+!!! error TS2720:   Property 'x' is missing in type C' but present in type 'A'.
         foo() {
             return 1;
         }
@@ -26,4 +26,4 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is n
     c2 = c;
     ~~
 !!! error TS2322: Type 'C' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'x' is missing in type 'C'.
\ No newline at end of file
+!!! error TS2322:   Property 'x' is missing in type C' but present in type 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass7.errors.txt b/tests/baselines/reference/classImplementsClass7.errors.txt
index fef48518dc935..da84b8b2fe05f 100644
--- a/tests/baselines/reference/classImplementsClass7.errors.txt
+++ b/tests/baselines/reference/classImplementsClass7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/classImplementsClass7.ts(5,7): error TS2720: Class 'B' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-  Property 'x' is missing in type 'B'.
+  Property 'x' is missing in type B' but present in type 'A'.
 
 
 ==== tests/cases/compiler/classImplementsClass7.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/compiler/classImplementsClass7.ts(5,7): error TS2720: Class 'B' inco
     class B implements A {}
           ~
 !!! error TS2720: Class 'B' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type 'B'.
+!!! error TS2720:   Property 'x' is missing in type B' but present in type 'A'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
index 3d2e721a955ff..e12dd4f08e394 100644
--- a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(9,7): error TS2720: Class 'C2' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-  Property 'x' is missing in type 'C2'.
+  Type 'C2' is missing the following properties from type 'C1': x, y
 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(12,7): error TS2720: Class 'C3' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-  Property 'y' is missing in type 'C3'.
+  Property 'y' is missing in type C3' but present in type 'C1'.
 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(16,7): error TS2720: Class 'C4' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-  Property 'x' is missing in type 'C4'.
+  Property 'x' is missing in type C4' but present in type 'C1'.
 
 
 ==== tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts (3 errors) ====
@@ -18,20 +18,20 @@ tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInte
     class C2 implements C1 { // error -- missing x
           ~~
 !!! error TS2720: Class 'C2' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type 'C2'.
+!!! error TS2720:   Type 'C2' is missing the following properties from type 'C1': x, y
     }
     
     class C3 implements C1 { // error -- missing y
           ~~
 !!! error TS2720: Class 'C3' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-!!! error TS2720:   Property 'y' is missing in type 'C3'.
+!!! error TS2720:   Property 'y' is missing in type C3' but present in type 'C1'.
         x : number;
     }
     
     class C4 implements C1 { // error -- missing x
           ~~
 !!! error TS2720: Class 'C4' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type 'C4'.
+!!! error TS2720:   Property 'x' is missing in type C4' but present in type 'C1'.
         y : number;
     }
     
diff --git a/tests/baselines/reference/classWithMultipleBaseClasses.errors.txt b/tests/baselines/reference/classWithMultipleBaseClasses.errors.txt
index 37eb63547edb4..6f254c3c198e9 100644
--- a/tests/baselines/reference/classWithMultipleBaseClasses.errors.txt
+++ b/tests/baselines/reference/classWithMultipleBaseClasses.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/classWithMultipleBaseClasses.ts(18,7): error TS2420: Class 'D' incorrectly implements interface 'I'.
-  Property 'foo' is missing in type 'D'.
+  Type 'D' is missing the following properties from type 'I': foo, bar
 
 
 ==== tests/cases/compiler/classWithMultipleBaseClasses.ts (1 errors) ====
@@ -23,7 +23,7 @@ tests/cases/compiler/classWithMultipleBaseClasses.ts(18,7): error TS2420: Class
     class D implements I, J {
           ~
 !!! error TS2420: Class 'D' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'foo' is missing in type 'D'.
+!!! error TS2420:   Type 'D' is missing the following properties from type 'I': foo, bar
         baz() { }
         bat() { }
     }
diff --git a/tests/baselines/reference/clodulesDerivedClasses.errors.txt b/tests/baselines/reference/clodulesDerivedClasses.errors.txt
index c3866c9e4beb3..47fe5e13adaa2 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.errors.txt
+++ b/tests/baselines/reference/clodulesDerivedClasses.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/clodulesDerivedClasses.ts(9,7): error TS2417: Class static side 'typeof Path' incorrectly extends base class static side 'typeof Shape'.
   Types of property 'Utils' are incompatible.
-    Type 'typeof Path.Utils' is not assignable to type 'typeof Shape.Utils'.
-      Property 'convert' is missing in type 'typeof Utils'.
+    Property 'convert' is missing in type typeof Utils' but present in type 'typeof Utils'.
 
 
 ==== tests/cases/compiler/clodulesDerivedClasses.ts (1 errors) ====
@@ -17,8 +16,7 @@ tests/cases/compiler/clodulesDerivedClasses.ts(9,7): error TS2417: Class static
           ~~~~
 !!! error TS2417: Class static side 'typeof Path' incorrectly extends base class static side 'typeof Shape'.
 !!! error TS2417:   Types of property 'Utils' are incompatible.
-!!! error TS2417:     Type 'typeof Path.Utils' is not assignable to type 'typeof Shape.Utils'.
-!!! error TS2417:       Property 'convert' is missing in type 'typeof Utils'.
+!!! error TS2417:     Property 'convert' is missing in type typeof Utils' but present in type 'typeof Utils'.
         name: string;
     
     }
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
index 2fa13333058bb..12220883faa2f 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(15,5): error TS2322: Type 'A | B' is not assignable to type 'A'.
   Type 'B' is not assignable to type 'A'.
-    Property 'propertyA' is missing in type 'B'.
+    Property 'propertyA' is missing in type B' but present in type 'A'.
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(16,5): error TS2322: Type 'A | B' is not assignable to type 'B'.
   Type 'A' is not assignable to type 'B'.
-    Property 'propertyB' is missing in type 'A'.
+    Property 'propertyB' is missing in type A' but present in type 'B'.
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(19,5): error TS2322: Type '((m: X) => number) | ((n: X) => string)' is not assignable to type '(t: X) => number'.
   Type '(n: X) => string' is not assignable to type '(t: X) => number'.
     Type 'string' is not assignable to type 'number'.
@@ -34,12 +34,12 @@ tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithou
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'A'.
 !!! error TS2322:   Type 'B' is not assignable to type 'A'.
-!!! error TS2322:     Property 'propertyA' is missing in type 'B'.
+!!! error TS2322:     Property 'propertyA' is missing in type B' but present in type 'A'.
     var result3: B = true ? a : b;
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'B'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'propertyB' is missing in type 'A'.
+!!! error TS2322:     Property 'propertyB' is missing in type A' but present in type 'B'.
     var result31: A | B = true ? a : b;
     
     var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt
index 49a36be96dbfd..80b6f9d760d9c 100644
--- a/tests/baselines/reference/conditionalTypes2.errors.txt
+++ b/tests/baselines/reference/conditionalTypes2.errors.txt
@@ -13,14 +13,11 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(25,5): error TS23
     Type 'A extends string ? keyof A : A' is not assignable to type 'B extends string ? keyof B : B'.
       Type 'A' is not assignable to type 'B'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(73,12): error TS2345: Argument of type 'Extract<Extract<T, Foo>, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-  Type 'Bar & Extract<T, Foo>' is not assignable to type '{ foo: string; bat: string; }'.
-    Property 'bat' is missing in type 'Bar & Foo'.
-      Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
-        Type 'Bar & Foo & T' is not assignable to type '{ foo: string; bat: string; }'.
-          Property 'bat' is missing in type 'Bar & Foo'.
+  Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+    Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
+      Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(74,12): error TS2345: Argument of type 'Extract<T, Foo & Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-  Type 'Foo & Bar & T' is not assignable to type '{ foo: string; bat: string; }'.
-    Property 'bat' is missing in type 'Foo & Bar'.
+  Property 'bat' is missing in type Foo & Bar' but present in type '{ foo: string; bat: string; }'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2345: Argument of type 'Extract2<T, Foo, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
   Type 'T extends Bar ? T : never' is not assignable to type '{ foo: string; bat: string; }'.
     Type 'Bar & Foo & T' is not assignable to type '{ foo: string; bat: string; }'.
@@ -120,16 +117,13 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2
         fooBat(x);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract<Extract<T, Foo>, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-!!! error TS2345:   Type 'Bar & Extract<T, Foo>' is not assignable to type '{ foo: string; bat: string; }'.
-!!! error TS2345:     Property 'bat' is missing in type 'Bar & Foo'.
-!!! error TS2345:       Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
-!!! error TS2345:         Type 'Bar & Foo & T' is not assignable to type '{ foo: string; bat: string; }'.
-!!! error TS2345:           Property 'bat' is missing in type 'Bar & Foo'.
+!!! error TS2345:   Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+!!! error TS2345:     Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
+!!! error TS2345:       Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
         fooBat(y);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract<T, Foo & Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-!!! error TS2345:   Type 'Foo & Bar & T' is not assignable to type '{ foo: string; bat: string; }'.
-!!! error TS2345:     Property 'bat' is missing in type 'Foo & Bar'.
+!!! error TS2345:   Property 'bat' is missing in type Foo & Bar' but present in type '{ foo: string; bat: string; }'.
         fooBat(z);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract2<T, Foo, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
diff --git a/tests/baselines/reference/constraints0.errors.txt b/tests/baselines/reference/constraints0.errors.txt
index 39cc7654e016e..b0889b2b1c1b6 100644
--- a/tests/baselines/reference/constraints0.errors.txt
+++ b/tests/baselines/reference/constraints0.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/constraints0.ts(14,11): error TS2344: Type 'B' does not satisfy the constraint 'A'.
-  Property 'a' is missing in type 'B'.
+tests/cases/compiler/constraints0.ts(14,11): error TS2737: Property 'a' is missing in type B' but present in type 'A'.
 
 
 ==== tests/cases/compiler/constraints0.ts (1 errors) ====
@@ -18,7 +17,6 @@ tests/cases/compiler/constraints0.ts(14,11): error TS2344: Type 'B' does not sat
     var v1: C<A>; // should work
     var v2: C<B>; // should not work
               ~
-!!! error TS2344: Type 'B' does not satisfy the constraint 'A'.
-!!! error TS2344:   Property 'a' is missing in type 'B'.
+!!! error TS2737: Property 'a' is missing in type B' but present in type 'A'.
     
     var y = v1.x.a; // 'a' should be of type 'number'
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
index fe9c6cf3f1456..ecbb9efbbfd64 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
   Types of parameters 'y' and 'e' are incompatible.
     Type 'Elephant' is not assignable to type 'Giraffe'.
-      Property 'y' is missing in type 'Elephant'.
+      Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
 
 
 ==== tests/cases/compiler/contextualSignatureInstatiationContravariance.ts (1 errors) ====
@@ -17,7 +17,7 @@ tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): erro
 !!! error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
 !!! error TS2322:   Types of parameters 'y' and 'e' are incompatible.
 !!! error TS2322:     Type 'Elephant' is not assignable to type 'Giraffe'.
-!!! error TS2322:       Property 'y' is missing in type 'Elephant'.
+!!! error TS2322:       Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
     
     var h2: (g1: Giraffe, g2: Giraffe) => void;
     h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypeWithTuple.errors.txt b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
index 9d9c015457bbc..6835340bb48af 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
@@ -3,9 +3,9 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(3,5): error TS232
     Type '3' is not assignable to type '2'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(15,1): error TS2322: Type '[number, string, boolean]' is not assignable to type '[number, string]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(18,17): error TS2322: Type '{}' is not assignable to type '{ a: string; }'.
-  Property 'a' is missing in type '{}'.
+  Property 'a' is missing in type {}' but present in type '{ a: string; }'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(19,1): error TS2322: Type '[number, string]' is not assignable to type '[number, string, boolean]'.
-  Property '2' is missing in type '[number, string]'.
+  Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(20,5): error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
@@ -13,7 +13,7 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(23,1): error TS23
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(24,1): error TS2322: Type '[C, string | number]' is not assignable to type '[C, string | number, D]'.
-  Property '2' is missing in type '[C, string | number]'.
+  Property '2' is missing in type [C, string | number]' but present in type '[C, string | number, D]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS2322: Type '[number, string | number]' is not assignable to type '[number, string]'.
   Type 'string | number' is not assignable to type 'string'.
     Type 'number' is not assignable to type 'string'.
@@ -46,11 +46,11 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
     objNumTuple = [ {}, 5];
                     ~~
 !!! error TS2322: Type '{}' is not assignable to type '{ a: string; }'.
-!!! error TS2322:   Property 'a' is missing in type '{}'.
+!!! error TS2322:   Property 'a' is missing in type {}' but present in type '{ a: string; }'.
     numStrBoolTuple = numStrTuple;
     ~~~~~~~~~~~~~~~
 !!! error TS2322: Type '[number, string]' is not assignable to type '[number, string, boolean]'.
-!!! error TS2322:   Property '2' is missing in type '[number, string]'.
+!!! error TS2322:   Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
     var strStrTuple: [string, string] = ["foo", "bar", 5];
         ~~~~~~~~~~~
 !!! error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
@@ -66,7 +66,7 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
     unionTuple2 = unionTuple;
     ~~~~~~~~~~~
 !!! error TS2322: Type '[C, string | number]' is not assignable to type '[C, string | number, D]'.
-!!! error TS2322:   Property '2' is missing in type '[C, string | number]'.
+!!! error TS2322:   Property '2' is missing in type [C, string | number]' but present in type '[C, string | number, D]'.
     numStrTuple = unionTuple3;
     ~~~~~~~~~~~
 !!! error TS2322: Type '[number, string | number]' is not assignable to type '[number, string]'.
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
index fb44cb57da7a4..cdeca6994d3cd 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
@@ -15,7 +15,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
         Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(25,5): error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
   Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
-    Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }'.
+    Property 'anotherP1' is missing in type { prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(29,5): error TS2322: Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
   Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
     Types of property 'prop' are incompatible.
@@ -74,7 +74,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
         ~~~~~~~~~~~~
 !!! error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
 !!! error TS2322:   Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
-!!! error TS2322:     Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }'.
+!!! error TS2322:     Property 'anotherP1' is missing in type { prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
         prop: strOrNumber,
         anotherP: str
     };
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index ac2920b8dac18..aa7ae480ecc0c 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/contextualTyping.ts(189,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not assignable to type 'B'.
-  Property 'x' is missing in type '{}'.
+  Property 'x' is missing in type {}' but present in type 'B'.
 
 
 ==== tests/cases/compiler/contextualTyping.ts (2 errors) ====
@@ -231,5 +231,5 @@ tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not
     var x: B = { };
         ~
 !!! error TS2322: Type '{}' is not assignable to type 'B'.
-!!! error TS2322:   Property 'x' is missing in type '{}'.
+!!! error TS2322:   Property 'x' is missing in type {}' but present in type 'B'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping11.errors.txt b/tests/baselines/reference/contextualTyping11.errors.txt
index 3aadb41cc0df1..39bf5b542cfff 100644
--- a/tests/baselines/reference/contextualTyping11.errors.txt
+++ b/tests/baselines/reference/contextualTyping11.errors.txt
@@ -1,9 +1,9 @@
 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'.
+  Property 'id' is missing in type foo' but present in type '{ id: number; }'.
 
 
 ==== 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:   Property 'id' is missing in type 'foo'.
\ No newline at end of file
+!!! error TS2322:   Property 'id' is missing in type foo' but present in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping5.errors.txt b/tests/baselines/reference/contextualTyping5.errors.txt
index 2d8e01836ecf5..53681ba9b3a15 100644
--- a/tests/baselines/reference/contextualTyping5.errors.txt
+++ b/tests/baselines/reference/contextualTyping5.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/contextualTyping5.ts(1,20): error TS2322: Type '{}' is not assignable to type '{ id: number; }'.
-  Property 'id' is missing in type '{}'.
+  Property 'id' is missing in type {}' but present in type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping5.ts (1 errors) ====
     class foo { public bar:{id:number;} = { }; }
                        ~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ id: number; }'.
-!!! error TS2322:   Property 'id' is missing in type '{}'.
\ No newline at end of file
+!!! error TS2322:   Property 'id' is missing in type {}' but present in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/covariantCallbacks.errors.txt b/tests/baselines/reference/covariantCallbacks.errors.txt
index 55c69c89728f1..7eaf2b10c4c65 100644
--- a/tests/baselines/reference/covariantCallbacks.errors.txt
+++ b/tests/baselines/reference/covariantCallbacks.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(12,5): error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A'.
+    Property 'b' is missing in type A' but present in type 'B'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(17,5): error TS2322: Type 'Promise<A>' is not assignable to type 'Promise<B>'.
   Type 'A' is not assignable to type 'B'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(30,5): error TS2322: Type 'AList1' is not assignable to type 'BList1'.
@@ -42,7 +42,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covarian
         ~
 !!! error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A'.
+!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
     }
     
     function f2(a: Promise<A>, b: Promise<B>) {
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
index 2938f7bf18d2a..6eea47311a44c 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'.
-  Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo'.
+  Property 'x' is missing in type (x: "hi", items: string[]) => typeof foo' but present in type 'D'.
 
 
 ==== tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts (1 errors) ====
@@ -14,5 +14,5 @@ tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): e
     var a: D = foo("hi", []);
         ~
 !!! error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'.
-!!! error TS2322:   Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo'.
+!!! error TS2322:   Property 'x' is missing in type (x: "hi", items: string[]) => typeof foo' but present in type 'D'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt
index 3ae6d587da529..1f3b6686b096c 100644
--- a/tests/baselines/reference/declarationsAndAssignments.errors.txt
+++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt
@@ -18,7 +18,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,14):
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,11): error TS2339: Property 'a' does not exist on type 'undefined[]'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,14): error TS2339: Property 'b' does not exist on type 'undefined[]'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(106,17): error TS2322: Type '{ y: boolean; }' is not assignable to type '{ x: any; y?: boolean; }'.
-  Property 'x' is missing in type '{ y: boolean; }'.
+  Property 'x' is missing in type { y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,6): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assignable to type 'string'.
 
@@ -170,7 +170,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9):
     f14([2, ["abc", { y: false }]]);  // Error, no x
                     ~~~~~~~~~~~~
 !!! error TS2322: Type '{ y: boolean; }' is not assignable to type '{ x: any; y?: boolean; }'.
-!!! error TS2322:   Property 'x' is missing in type '{ y: boolean; }'.
+!!! error TS2322:   Property 'x' is missing in type { y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
     
     module M {
         export var [a, b] = [1, 2];
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
index 6499aa44e537b..e54eba78300eb 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6): error TS2345: Argument of type 'C' is not assignable to parameter of type 'Function'.
-  Property 'apply' is missing in type 'C'.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6): error TS2736: Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
 
 
 ==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts (1 errors) ====
@@ -8,6 +7,5 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6)
     class C {
         @dec method() {}
          ~~~
-!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'Function'.
-!!! error TS2345:   Property 'apply' is missing in type 'C'.
+!!! error TS2736: Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
index 772d1e4f5a397..ac6bb7ebbb0a7 100644
--- a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
+++ b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22:17 - error TS2322: Type '{}' is not assignable to type 'A'.
-  Property 'a' is missing in type '{}'.
+  Property 'a' is missing in type {}' but present in type 'A'.
 
 22                 thing: {}
                    ~~~~~
@@ -9,7 +9,7 @@
                       ~~~~~
     The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:25:17 - error TS2322: Type '{}' is not assignable to type 'A'.
-  Property 'a' is missing in type '{}'.
+  Property 'a' is missing in type {}' but present in type 'A'.
 
 25                 another: {}
                    ~~~~~~~
@@ -45,14 +45,14 @@
                     thing: {}
                     ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'A'.
-!!! error TS2322:   Property 'a' is missing in type '{}'.
+!!! error TS2322:   Property 'a' is missing in type {}' but present in type 'A'.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17: The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
                 },
                 yetstill: {
                     another: {}
                     ~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'A'.
-!!! error TS2322:   Property 'a' is missing in type '{}'.
+!!! error TS2322:   Property 'a' is missing in type {}' but present in type 'A'.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17: The expected type comes from property 'another' which is declared here on type '{ another: A; }'
                 }
             }
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt
index 78f5720894bb2..f6742934b131e 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt
@@ -5,9 +5,9 @@ tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAss
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(4,5): error TS2461: Type 'undefined' is not an array type.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(9,51): error TS2322: Type 'number' is not assignable to type 'boolean'.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(22,5): error TS2322: Type 'number[]' is not assignable to type '[number, number]'.
-  Property '0' is missing in type 'number[]'.
+  Type 'number[]' is missing the following properties from type '[number, number]': 0, 1
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(23,5): error TS2322: Type 'number[]' is not assignable to type '[string, string]'.
-  Property '0' is missing in type 'number[]'.
+  Type 'number[]' is missing the following properties from type '[string, string]': 0, 1
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(34,5): error TS2461: Type 'F' is not an array type.
 
 
@@ -48,11 +48,11 @@ tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAss
     var [c0, c1]: [number, number] = [...temp];  // Error
         ~~~~~~~~
 !!! error TS2322: Type 'number[]' is not assignable to type '[number, number]'.
-!!! error TS2322:   Property '0' is missing in type 'number[]'.
+!!! error TS2322:   Type 'number[]' is missing the following properties from type '[number, number]': 0, 1
     var [c2, c3]: [string, string] = [...temp];  // Error
         ~~~~~~~~
 !!! error TS2322: Type 'number[]' is not assignable to type '[string, string]'.
-!!! error TS2322:   Property '0' is missing in type 'number[]'.
+!!! error TS2322:   Type 'number[]' is missing the following properties from type '[string, string]': 0, 1
     
     interface F {
         [idx: number]: boolean
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
index a3ca44020c2a9..c0b605e591653 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
@@ -9,8 +9,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(30,14): error TS2300: Duplicate identifier 'z'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(30,18): error TS2300: Duplicate identifier 'z'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(34,6): error TS2322: Type 'number' is not assignable to type '{ x: any; y: { j: any; }; }'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(35,4): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ z: number; }'.
-  Property 'z' is missing in type '{}'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(35,4): error TS2737: Property 'z' is missing in type {}' but present in type '{ z: number; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(36,6): error TS2322: Type 'true' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(37,6): error TS2322: Type 'false' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(38,6): error TS2322: Type 'true' is not assignable to type 'string | number'.
@@ -23,7 +22,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
     Types of parameters '__0' and '__0' are incompatible.
       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
-        Property 'c' is missing in type '{ x: any; y: any; z: any; }'.
+        Property 'c' is missing in type { x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,18): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,26): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,34): error TS2300: Duplicate identifier 'number'.
@@ -87,8 +86,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2322: Type 'number' is not assignable to type '{ x: any; y: { j: any; }; }'.
     c1({});            // Error, implied type is {z:number}?
        ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type '{ z: number; }'.
-!!! error TS2345:   Property 'z' is missing in type '{}'.
+!!! error TS2737: Property 'z' is missing in type {}' but present in type '{ z: number; }'.
     c1({ z: true });   // Error, implied type is {z:number}?
          ~
 !!! error TS2322: Type 'true' is not assignable to type 'number'.
@@ -134,7 +132,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2416:   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
 !!! error TS2416:     Types of parameters '__0' and '__0' are incompatible.
 !!! error TS2416:       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
-!!! error TS2416:         Property 'c' is missing in type '{ x: any; y: any; z: any; }'.
+!!! error TS2416:         Property 'c' is missing in type { x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
         e0([a, b, q]) { }
     }
     
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
index 89c0cad0d3ab7..4b77b5418cd2d 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
@@ -2,8 +2,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(30,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
-  Property '2' is missing in type '[number, number]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(30,5): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts (3 errors) ====
@@ -44,8 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
-!!! error TS2345:   Property '2' is missing in type '[number, number]'.
+!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
index 047ee9e191c54..f214a6ee73339 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
@@ -2,8 +2,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5i
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(30,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
-  Property '2' is missing in type '[number, number]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(30,5): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts (3 errors) ====
@@ -44,8 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5i
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
-!!! error TS2345:   Property '2' is missing in type '[number, number]'.
+!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
index 38b56187a28b0..5e940a7eb6367 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
@@ -2,8 +2,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(30,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
-  Property '2' is missing in type '[number, number]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(30,5): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts (3 errors) ====
@@ -44,8 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
-!!! error TS2345:   Property '2' is missing in type '[number, number]'.
+!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
index ed6360bdd328e..812a43b55f605 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
@@ -3,8 +3,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(20,19): error TS2345: Argument of type 'true' is not assignable to parameter of type 'string | number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(21,7): error TS2552: Cannot find name 'array2'. Did you mean 'Array'?
 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(23,4): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]]]'.
 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'.
@@ -47,8 +46,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 !!! error TS2322: Type 'string' is not assignable to type '[[any]]'.
     a5([1, 2]);                              // Error, parameter type is [any, any, [[any]]]
        ~~~~~~
-!!! 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]'.
+!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]]]'.
     a6([1, 2, "string"]);                   // Error, parameter type is number[]
               ~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
index be65d7c37aa1d..24711dbb42a31 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(47,6): error TS2322: Type 'Class' is not assignable to type 'D'.
-  Property 'foo' is missing in type 'Class'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ y: D; }'.
-  Property 'y' is missing in type '{}'.
+  Property 'foo' is missing in type Class' but present in type 'D'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2737: Property 'y' is missing in type {}' but present in type '{ y: D; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(49,6): error TS2322: Type 'number' is not assignable to type 'D'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(50,6): error TS2322: Type 'string' is not assignable to type 'D'.
 
@@ -56,12 +55,11 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(
     d3({ y: new Class() });
          ~
 !!! error TS2322: Type 'Class' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo' is missing in type 'Class'.
+!!! error TS2322:   Property 'foo' is missing in type Class' but present in type 'D'.
 !!! related TS6500 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: The expected type comes from property 'y' which is declared here on type '{ y: D; }'
     d3({});
        ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type '{ y: D; }'.
-!!! error TS2345:   Property 'y' is missing in type '{}'.
+!!! error TS2737: Property 'y' is missing in type {}' but present in type '{ y: D; }'.
     d3({ y: 1 });
          ~
 !!! error TS2322: Type 'number' is not assignable to type 'D'.
diff --git a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
index 4af77e234f995..21f621604c205 100644
--- a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
+++ b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(10,8): error TS2322: Type 'typeof Bar' is not assignable to type 'Bar'.
-  Property 'x' is missing in type 'typeof Bar'.
+  Property 'x' is missing in type typeof Bar' but present in type 'Bar'.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(11,8): error TS2322: Type 'DateConstructor' is not assignable to type 'Date'.
-  Property 'toDateString' is missing in type 'DateConstructor'.
+  Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(17,4): error TS2345: Argument of type '() => number' is not assignable to parameter of type 'number'.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(26,5): error TS2322: Type '() => number' is not assignable to type 'number'.
 
@@ -19,12 +19,12 @@ tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(2
         x: Bar,
            ~~~
 !!! error TS2322: Type 'typeof Bar' is not assignable to type 'Bar'.
-!!! error TS2322:   Property 'x' is missing in type 'typeof Bar'.
+!!! error TS2322:   Property 'x' is missing in type typeof Bar' but present in type 'Bar'.
 !!! related TS6213 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:10:8: Did you mean to use 'new' with this expression?
         y: Date
            ~~~~
 !!! error TS2322: Type 'DateConstructor' is not assignable to type 'Date'.
-!!! error TS2322:   Property 'toDateString' is missing in type 'DateConstructor'.
+!!! error TS2322:   Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
 !!! related TS6213 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:11:8: Did you mean to use 'new' with this expression?
     }, getNum());
     
diff --git a/tests/baselines/reference/differentTypesWithSameName.errors.txt b/tests/baselines/reference/differentTypesWithSameName.errors.txt
index b0850ee7f414b..6963507dd63b8 100644
--- a/tests/baselines/reference/differentTypesWithSameName.errors.txt
+++ b/tests/baselines/reference/differentTypesWithSameName.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'.
-  Property 's' is missing in type 'variable'.
+tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2737: Property 's' is missing in type variable' but present in type 'variable'.
 
 
 ==== tests/cases/compiler/differentTypesWithSameName.ts (1 errors) ====
@@ -20,5 +19,4 @@ tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2345: Argumen
     var v: variable = new variable();
     m.doSomething(v);
                   ~
-!!! error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'.
-!!! error TS2345:   Property 's' is missing in type 'variable'.
\ No newline at end of file
+!!! error TS2737: Property 's' is missing in type variable' but present in type 'variable'.
\ No newline at end of file
diff --git a/tests/baselines/reference/elaboratedErrors.errors.txt b/tests/baselines/reference/elaboratedErrors.errors.txt
index a9060282404e1..bdcbdd2ff395d 100644
--- a/tests/baselines/reference/elaboratedErrors.errors.txt
+++ b/tests/baselines/reference/elaboratedErrors.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/elaboratedErrors.ts(11,3): error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'FileSystem'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/elaboratedErrors.ts(20,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-  Property 'x' is missing in type 'Beta'.
+  Property 'x' is missing in type Beta' but present in type 'Alpha'.
 tests/cases/compiler/elaboratedErrors.ts(21,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
 tests/cases/compiler/elaboratedErrors.ts(24,1): error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
-  Property 'y' is missing in type 'Alpha'.
+  Property 'y' is missing in type Alpha' but present in type 'Beta'.
 tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
 
 
@@ -34,7 +34,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     x = y;
     ~
 !!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-!!! error TS2322:   Property 'x' is missing in type 'Beta'.
+!!! error TS2322:   Property 'x' is missing in type Beta' but present in type 'Alpha'.
     x = y;
     ~
 !!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
@@ -43,7 +43,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     y = x;
     ~
 !!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
-!!! error TS2322:   Property 'y' is missing in type 'Alpha'.
+!!! error TS2322:   Property 'y' is missing in type Alpha' but present in type 'Beta'.
     y = x;
     ~
 !!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
diff --git a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
index b70d3d744efef..b2a7a5875211b 100644
--- a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
+++ b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
@@ -5,7 +5,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(14,12): error TS2322: Typ
 tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
     Type 'ctor' is not assignable to type '{ somePropA: any; }'.
-      Property 'somePropA' is missing in type 'ctor'.
+      Property 'somePropA' is missing in type ctor' but present in type '{ somePropA: any; }'.
 
 
 ==== tests/cases/compiler/errorsWithInvokablesInUnions01.ts (2 errors) ====
@@ -34,7 +34,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Typ
 !!! error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
 !!! error TS2322:   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
 !!! error TS2322:     Type 'ctor' is not assignable to type '{ somePropA: any; }'.
-!!! error TS2322:       Property 'somePropA' is missing in type 'ctor'.
+!!! error TS2322:       Property 'somePropA' is missing in type ctor' but present in type '{ somePropA: any; }'.
         someUnaccountedProp: any;
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
index 81a3ceab8ef45..69194873544d9 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
@@ -3,11 +3,11 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(36,5): error TS2322: Type '9.9' is not assignable to type 'Date'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(38,5): error TS2322: Type '9.9' is not assignable to type 'void'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(40,5): error TS2322: Type 'D<{}>' is not assignable to type 'I'.
-  Property 'id' is missing in type 'D<{}>'.
+  Property 'id' is missing in type D<{}>' but present in type 'I'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(41,5): error TS2322: Type 'D<{}>' is not assignable to type 'C'.
-  Property 'id' is missing in type 'D<{}>'.
+  Property 'id' is missing in type D<{}>' but present in type 'C'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(42,5): error TS2322: Type 'C' is not assignable to type 'D<string>'.
-  Property 'source' is missing in type 'C'.
+  Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(43,28): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(44,5): error TS2322: Type 'C' is not assignable to type '{ id: string; }'.
   Types of property 'id' are incompatible.
@@ -23,7 +23,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
   Types of property 'A' are incompatible.
     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
       Type 'N.A' is not assignable to type 'M.A'.
-        Property 'name' is missing in type 'A'.
+        Property 'name' is missing in type A' but present in type 'A'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(51,5): error TS2322: Type 'N.A' is not assignable to type 'M.A'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(52,5): error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: number) => string'.
   Type 'boolean' is not assignable to type 'string'.
@@ -80,15 +80,15 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
     var anInterface: I = new D();
         ~~~~~~~~~~~
 !!! error TS2322: Type 'D<{}>' is not assignable to type 'I'.
-!!! error TS2322:   Property 'id' is missing in type 'D<{}>'.
+!!! error TS2322:   Property 'id' is missing in type D<{}>' but present in type 'I'.
     var aClass: C = new D();
         ~~~~~~
 !!! error TS2322: Type 'D<{}>' is not assignable to type 'C'.
-!!! error TS2322:   Property 'id' is missing in type 'D<{}>'.
+!!! error TS2322:   Property 'id' is missing in type D<{}>' but present in type 'C'.
     var aGenericClass: D<string> = new C();
         ~~~~~~~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D<string>'.
-!!! error TS2322:   Property 'source' is missing in type 'C'.
+!!! error TS2322:   Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
     var anObjectLiteral: I = { id: 'a string' };
                                ~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
@@ -120,7 +120,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 !!! error TS2322:   Types of property 'A' are incompatible.
 !!! error TS2322:     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
 !!! error TS2322:       Type 'N.A' is not assignable to type 'M.A'.
-!!! error TS2322:         Property 'name' is missing in type 'A'.
+!!! error TS2322:         Property 'name' is missing in type A' but present in type 'A'.
     var aClassInModule: M.A = new N.A();
         ~~~~~~~~~~~~~~
 !!! error TS2322: Type 'N.A' is not assignable to type 'M.A'.
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
index 958bf059324f1..6e4c0962a0f06 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(11,21): error TS2322: Type
   Object literal may only specify known properties, and 'd20' does not exist in type '{ tag: "A"; a1: string; }'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(12,1): error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
   Type '{ tag: "D"; }' is not assignable to type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
-    Property 'd20' is missing in type '{ tag: "D"; }'.
+    Property 'd20' is missing in type { tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(33,28): error TS2322: Type '{ tag: "A"; x: string; extra: number; }' is not assignable to type 'Ambiguous'.
   Object literal may only specify known properties, and 'extra' does not exist in type 'Ambiguous'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(34,26): error TS2322: Type '{ tag: "A"; y: number; extra: number; }' is not assignable to type 'Ambiguous'.
@@ -50,7 +50,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(66,9): error TS2322: Type
     ~~~~~
 !!! error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
 !!! error TS2322:   Type '{ tag: "D"; }' is not assignable to type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
-!!! error TS2322:     Property 'd20' is missing in type '{ tag: "D"; }'.
+!!! error TS2322:     Property 'd20' is missing in type { tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
     
     type Ambiguous = {
         tag: "A",
diff --git a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
index a6cf5ee8267c1..081bd59ec3726 100644
--- a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
+++ b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/index.ts(10,6): error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
-  Property 'foo' is missing in type '{ foob: string; }'.
-tests/cases/compiler/index.ts(12,6): error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
-  Property 'foo' is missing in type '{ foob: string; }'.
+tests/cases/compiler/index.ts(10,6): error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
+tests/cases/compiler/index.ts(12,6): error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
 
 
 ==== tests/cases/compiler/items.ts (0 errors) ====
@@ -24,11 +22,9 @@ tests/cases/compiler/index.ts(12,6): error TS2345: Argument of type '{ foob: str
     
     nFoo(q); // for comparison
          ~
-!!! error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
-!!! error TS2345:   Property 'foo' is missing in type '{ foob: string; }'.
+!!! error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
     
     nFoo(B);
          ~
-!!! error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
-!!! error TS2345:   Property 'foo' is missing in type '{ foob: string; }'.
+!!! error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
index d295f836605d2..be0bba6d0f406 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Type 'Base' is not assignable to type 'Derived'.
-  Property 'toBase' is missing in type 'Base'.
+  Property 'toBase' is missing in type Base' but present in type 'Derived'.
 
 
 ==== tests/cases/compiler/fixingTypeParametersRepeatedly2.ts (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Ty
     var result = foo(derived, d => d.toBase());
                                    ~~~~~~~~~~
 !!! error TS2322: Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:   Property 'toBase' is missing in type 'Base'.
+!!! error TS2322:   Property 'toBase' is missing in type Base' but present in type 'Derived'.
 !!! 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.
diff --git a/tests/baselines/reference/for-of31.errors.txt b/tests/baselines/reference/for-of31.errors.txt
index bf38e0f5008a9..087556d87c97e 100644
--- a/tests/baselines/reference/for-of31.errors.txt
+++ b/tests/baselines/reference/for-of31.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
         Types of property 'next' are incompatible.
           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
             Type '{ value: string; }' is not assignable to type 'IteratorResult<string>'.
-              Property 'done' is missing in type '{ value: string; }'.
+              Property 'done' is missing in type { value: string; }' but present in type 'IteratorResult<string>'.
 
 
 ==== tests/cases/conformance/es6/for-ofStatements/for-of31.ts (1 errors) ====
@@ -31,4 +31,4 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
 !!! error TS2322:             Type '{ value: string; }' is not assignable to type 'IteratorResult<string>'.
-!!! error TS2322:               Property 'done' is missing in type '{ value: string; }'.
\ No newline at end of file
+!!! error TS2322:               Property 'done' is missing in type { value: string; }' but present in type 'IteratorResult<string>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads41.errors.txt b/tests/baselines/reference/functionOverloads41.errors.txt
index a3d924f15bcf2..bf5cac4ea481e 100644
--- a/tests/baselines/reference/functionOverloads41.errors.txt
+++ b/tests/baselines/reference/functionOverloads41.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
-  Property 'a' is missing in type '{}'.
+  Property 'a' is missing in type {}' but present in type '{ a: boolean; }'.
 
 
 ==== tests/cases/compiler/functionOverloads41.ts (1 errors) ====
@@ -9,5 +9,5 @@ tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is no
     var x = foo([{}]);
                  ~~
 !!! error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
-!!! error TS2322:   Property 'a' is missing in type '{}'.
+!!! error TS2322:   Property 'a' is missing in type {}' but present in type '{ a: boolean; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index 879789e4b2351..bb967723d0e8f 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -1,9 +1,8 @@
 tests/cases/compiler/fuzzy.ts(13,18): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property 'alsoWorks' is missing in type 'C'.
+  Property 'alsoWorks' is missing in type C' but present in type 'I'.
 tests/cases/compiler/fuzzy.ts(21,34): error TS2322: Type 'this' is not assignable to type 'I'.
   Type 'C' is not assignable to type 'I'.
-tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Conversion of type '{ oneI: this; }' to type 'R' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'anything' is missing in type '{ oneI: this; }'.
+tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missing in type { oneI: this; }' but present in type 'R'.
 
 
 ==== tests/cases/compiler/fuzzy.ts (3 errors) ====
@@ -22,7 +21,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Conversion of type '{ oneI:
         export class C implements I {
                      ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'alsoWorks' is missing in type 'C'.
+!!! error TS2420:   Property 'alsoWorks' is missing in type C' but present in type 'I'.
             constructor(public x:number) {
             }
             works():R {
@@ -40,8 +39,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Conversion of type '{ oneI:
             worksToo():R {
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type '{ oneI: this; }' to type 'R' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'anything' is missing in type '{ oneI: this; }'.
+!!! error TS2737: Property 'anything' is missing in type { oneI: this; }' but present in type 'R'.
             }
         }
     }
diff --git a/tests/baselines/reference/generatorTypeCheck18.errors.txt b/tests/baselines/reference/generatorTypeCheck18.errors.txt
index 2c6deab9821eb..774c4a410088a 100644
--- a/tests/baselines/reference/generatorTypeCheck18.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck18.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-  Property 'x' is missing in type 'Baz'.
+  Property 'x' is missing in type Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): erro
         yield new Baz;
               ~~~~~~~
 !!! error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'x' is missing in type 'Baz'.
+!!! error TS2322:   Property 'x' is missing in type Baz' but present in type 'Foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck20.errors.txt b/tests/baselines/reference/generatorTypeCheck20.errors.txt
index c6e8200d106b6..b7b16e66fba51 100644
--- a/tests/baselines/reference/generatorTypeCheck20.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck20.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-  Property 'x' is missing in type 'Baz'.
+  Property 'x' is missing in type Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): erro
         yield * [new Baz];
                 ~~~~~~~~~
 !!! error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'x' is missing in type 'Baz'.
+!!! error TS2322:   Property 'x' is missing in type Baz' but present in type 'Foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck25.errors.txt b/tests/baselines/reference/generatorTypeCheck25.errors.txt
index 8d414c7c47161..f4de562f4e0fd 100644
--- a/tests/baselines/reference/generatorTypeCheck25.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck25.errors.txt
@@ -8,7 +8,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
                 Type 'Bar | Baz' is not assignable to type 'Foo'.
                   Type 'Baz' is not assignable to type 'Foo'.
-                    Property 'x' is missing in type 'Baz'.
+                    Property 'x' is missing in type Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts (1 errors) ====
@@ -27,7 +27,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
 !!! error TS2322:               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
 !!! error TS2322:                 Type 'Bar | Baz' is not assignable to type 'Foo'.
 !!! error TS2322:                   Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:                     Property 'x' is missing in type 'Baz'.
+!!! error TS2322:                     Property 'x' is missing in type Baz' but present in type 'Foo'.
         yield;
         yield new Bar;
         yield new Baz;
diff --git a/tests/baselines/reference/generatorTypeCheck7.errors.txt b/tests/baselines/reference/generatorTypeCheck7.errors.txt
index 2653ecf8cd597..23de46a05f610 100644
--- a/tests/baselines/reference/generatorTypeCheck7.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error TS2322: Type 'IterableIterator<number>' is not assignable to type 'WeirdIter'.
-  Property 'hello' is missing in type 'IterableIterator<number>'.
+  Property 'hello' is missing in type IterableIterator<number>' but present in type 'WeirdIter'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts (1 errors) ====
@@ -9,4 +9,4 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error
     function* g1(): WeirdIter { }
                     ~~~~~~~~~
 !!! error TS2322: Type 'IterableIterator<number>' is not assignable to type 'WeirdIter'.
-!!! error TS2322:   Property 'hello' is missing in type 'IterableIterator<number>'.
\ No newline at end of file
+!!! error TS2322:   Property 'hello' is missing in type IterableIterator<number>' but present in type 'WeirdIter'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericArrayExtenstions.errors.txt b/tests/baselines/reference/genericArrayExtenstions.errors.txt
index ac0b40728498d..f93456cf4dfdf 100644
--- a/tests/baselines/reference/genericArrayExtenstions.errors.txt
+++ b/tests/baselines/reference/genericArrayExtenstions.errors.txt
@@ -1,12 +1,12 @@
 tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS2420: Class 'ObservableArray<T>' incorrectly implements interface 'T[]'.
-  Property 'length' is missing in type 'ObservableArray<T>'.
+  Type 'ObservableArray<T>' is missing the following properties from type 'T[]': length, pop, push, join, and 15 more.
 
 
 ==== tests/cases/compiler/genericArrayExtenstions.ts (1 errors) ====
     export declare class ObservableArray<T> implements Array<T> { // MS.Entertainment.ObservableArray
                          ~~~~~~~~~~~~~~~
 !!! error TS2420: Class 'ObservableArray<T>' incorrectly implements interface 'T[]'.
-!!! error TS2420:   Property 'length' is missing in type 'ObservableArray<T>'.
+!!! error TS2420:   Type 'ObservableArray<T>' is missing the following properties from type 'T[]': length, pop, push, join, and 15 more.
     concat<U extends T[]>(...items: U[]): T[];
     concat(...items: T[]): T[];
     }
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
index d6cbc5d17b796..c1a1305a6a59c 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts(18,32): error TS2322: Type 'Derived2' is not assignable to type 'Derived'.
-  Property 'y' is missing in type 'Derived2'.
+  Property 'y' is missing in type Derived2' but present in type 'Derived'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts (1 errors) ====
@@ -23,7 +23,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other
                                    ~
 !!! error TS2322: Type 'Derived2' is not assignable to type 'Derived'.
-!!! error TS2322:   Property 'y' is missing in type 'Derived2'.
+!!! error TS2322:   Property 'y' is missing in type Derived2' but present in type 'Derived'.
 !!! related TS6500 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts:13:39: The expected type comes from property 'y' which is declared here on type '{ x: Derived; y: Derived; }'
     
     function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
index c5c6cbe05c61c..3aa1a8158a72c 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
-  Property 'y' is missing in type 'C'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2737: Property 'y' is missing in type C' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'.
 
 
@@ -24,8 +23,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r = foo(c, d);
     var r2 = foo(d, c); // error because C does not extend D
                     ~
-!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
-!!! error TS2345:   Property 'y' is missing in type 'C'.
+!!! error TS2737: Property 'y' is missing in type C' but present in type 'D'.
     var r3 = foo(c, { x: '', foo: c });
     var r4 = foo(null, null);
     var r5 = foo({}, null);
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
index 2632e867edfde..b37127522f8cb 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
-  Property 'y' is missing in type 'C'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2737: Property 'y' is missing in type C' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(19,23): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
   Type 'void' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'.
@@ -25,8 +24,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var d: D;
     var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
                     ~
-!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
-!!! error TS2345:   Property 'y' is missing in type 'C'.
+!!! error TS2737: Property 'y' is missing in type C' but present in type 'D'.
     var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
                           ~~~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
diff --git a/tests/baselines/reference/genericCallWithTupleType.errors.txt b/tests/baselines/reference/genericCallWithTupleType.errors.txt
index b8f354545de77..62c8c208b5a23 100644
--- a/tests/baselines/reference/genericCallWithTupleType.errors.txt
+++ b/tests/baselines/reference/genericCallWithTupleType.errors.txt
@@ -10,7 +10,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,14): error TS2322: Type '{}' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,18): error TS2322: Type '{}' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(24,1): error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
-  Property '1' is missing in type '[{}]'.
+  Property '1' is missing in type [{}]' but present in type '[{}, {}]'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts (10 errors) ====
@@ -60,5 +60,5 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
     i2.tuple1 = [{}];
     ~~~~~~~~~
 !!! error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
-!!! error TS2322:   Property '1' is missing in type '[{}]'.
+!!! error TS2322:   Property '1' is missing in type [{}]' but present in type '[{}, {}]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericConstraint2.errors.txt b/tests/baselines/reference/genericConstraint2.errors.txt
index 97d468f5d5d3f..f0d4866cb3d84 100644
--- a/tests/baselines/reference/genericConstraint2.errors.txt
+++ b/tests/baselines/reference/genericConstraint2.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/genericConstraint2.ts(11,7): error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable<string>'.
-  Property 'comparer' is missing in type 'ComparableString'.
-tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable<ComparableString>'.
-  Property 'comparer' is missing in type 'ComparableString'.
+  Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<string>'.
+tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<ComparableString>'.
 
 
 ==== tests/cases/compiler/genericConstraint2.ts (2 errors) ====
@@ -18,7 +17,7 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'Comparabl
     class ComparableString implements Comparable<string>{
           ~~~~~~~~~~~~~~~~
 !!! error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable<string>'.
-!!! error TS2420:   Property 'comparer' is missing in type 'ComparableString'.
+!!! error TS2420:   Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<string>'.
         constructor(public currentValue: string) { }
     
         localeCompare(other) {
@@ -30,5 +29,4 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'Comparabl
     var b = new ComparableString("b");
     var c = compare<ComparableString>(a, b);
                     ~~~~~~~~~~~~~~~~
-!!! error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable<ComparableString>'.
-!!! error TS2344:   Property 'comparer' is missing in type 'ComparableString'.
\ No newline at end of file
+!!! error TS2737: Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<ComparableString>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericRestParameters2.errors.txt b/tests/baselines/reference/genericRestParameters2.errors.txt
index d6d3de9f32234..2fd6309b30064 100644
--- a/tests/baselines/reference/genericRestParameters2.errors.txt
+++ b/tests/baselines/reference/genericRestParameters2.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/rest/genericRestParameters2.ts(71,40): error TS2344: Type '(x: string, ...args: T) => void' does not satisfy the constraint '(...args: any[]) => any'.
   Types of parameters 'x' and 'args' are incompatible.
-    Type 'any[]' is not assignable to type '[string, ...any[]]'.
-      Property '0' is missing in type 'any[]'.
+    Property '0' is missing in type any[]' but present in type '[string, ...any[]]'.
 
 
 ==== tests/cases/conformance/types/rest/genericRestParameters2.ts (1 errors) ====
@@ -79,8 +78,7 @@ tests/cases/conformance/types/rest/genericRestParameters2.ts(71,40): error TS234
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2344: Type '(x: string, ...args: T) => void' does not satisfy the constraint '(...args: any[]) => any'.
 !!! error TS2344:   Types of parameters 'x' and 'args' are incompatible.
-!!! error TS2344:     Type 'any[]' is not assignable to type '[string, ...any[]]'.
-!!! error TS2344:       Property '0' is missing in type 'any[]'.
+!!! error TS2344:     Property '0' is missing in type any[]' but present in type '[string, ...any[]]'.
     type T06 = T05<[number, ...boolean[]]>;
     
     type P1<T extends Function> = T extends (head: infer A, ...tail: infer B) => any ? { head: A, tail: B } : any[];
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index f02446b9d2263..4d46b38970501 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -2,8 +2,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(11,11): error TS234
   Type '[10]' is not assignable to type '[string]'.
     Type '10' is not assignable to type 'string'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(12,1): error TS2345: Argument of type '[]' is not assignable to parameter of type '[string] | [number, boolean]'.
-  Type '[]' is not assignable to type '[number, boolean]'.
-    Property '0' is missing in type '[]'.
+  Type '[]' is missing the following properties from type '[number, boolean]': 0, 1
 tests/cases/conformance/types/rest/genericRestParameters3.ts(16,1): error TS2322: Type '(x: string, ...args: [string] | [number, boolean]) => void' is not assignable to type '(...args: [string, string] | [string, number, boolean]) => void'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(17,1): error TS2322: Type '(x: string, y: string) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
   Types of parameters 'y' and 'args' are incompatible.
@@ -15,27 +14,20 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(18,1): error TS2322
   Types of parameters 'y' and 'args' are incompatible.
     Type '[string] | [number, boolean]' is not assignable to type '[number, boolean]'.
       Type '[string]' is not assignable to type '[number, boolean]'.
-        Property '1' is missing in type '[string]'.
+        Property '1' is missing in type [string]' but present in type '[number, boolean]'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(19,1): error TS2322: Type '(...args: [string, string] | [string, number, boolean]) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(29,1): error TS2554: Expected 1 arguments, but got 0.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(30,21): error TS2345: Argument of type '100' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(31,21): error TS2345: Argument of type '<T extends any[]>(cb: (...args: T) => void) => void' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
   Types of parameters 'cb' and 'args' are incompatible.
-    Type 'CoolArray<any>' is not assignable to type '[(...args: any[]) => void]'.
-      Property '0' is missing in type 'CoolArray<any>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(38,32): error TS2345: Argument of type '[10, 20]' is not assignable to parameter of type 'CoolArray<number>'.
-  Property 'hello' is missing in type '[10, 20]'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(43,1): error TS2345: Argument of type '[]' is not assignable to parameter of type 'CoolArray<never>'.
-  Property 'hello' is missing in type '[]'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(44,5): error TS2345: Argument of type '[number]' is not assignable to parameter of type 'CoolArray<{}>'.
-  Property 'hello' is missing in type '[number]'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(45,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type 'CoolArray<{}>'.
-  Property 'hello' is missing in type '[number, number]'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(46,5): error TS2345: Argument of type 'number[]' is not assignable to parameter of type 'CoolArray<number>'.
-  Property 'hello' is missing in type 'number[]'.
+    Property '0' is missing in type CoolArray<any>' but present in type '[(...args: any[]) => void]'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(38,32): error TS2737: Property 'hello' is missing in type [10, 20]' but present in type 'CoolArray<number>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(43,1): error TS2737: Property 'hello' is missing in type []' but present in type 'CoolArray<never>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(44,5): error TS2737: Property 'hello' is missing in type [number]' but present in type 'CoolArray<{}>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(45,5): error TS2737: Property 'hello' is missing in type [number, number]' but present in type 'CoolArray<{}>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(46,5): error TS2737: Property 'hello' is missing in type number[]' but present in type 'CoolArray<number>'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345: Argument of type '["what"]' is not assignable to parameter of type '[] | [number, string]'.
-  Type '["what"]' is not assignable to type '[number, string]'.
-    Property '1' is missing in type '["what"]'.
+  Property '1' is missing in type ["what"]' but present in type '[number, string]'.
 
 
 ==== tests/cases/conformance/types/rest/genericRestParameters3.ts (15 errors) ====
@@ -57,8 +49,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     f1("foo");  // Error
     ~~~~~~~~~
 !!! error TS2345: Argument of type '[]' is not assignable to parameter of type '[string] | [number, boolean]'.
-!!! error TS2345:   Type '[]' is not assignable to type '[number, boolean]'.
-!!! error TS2345:     Property '0' is missing in type '[]'.
+!!! error TS2345:   Type '[]' is missing the following properties from type '[number, boolean]': 0, 1
     
     f2 = f1;
     f3 = f1;
@@ -79,7 +70,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
 !!! error TS2322:   Types of parameters 'y' and 'args' are incompatible.
 !!! error TS2322:     Type '[string] | [number, boolean]' is not assignable to type '[number, boolean]'.
 !!! error TS2322:       Type '[string]' is not assignable to type '[number, boolean]'.
-!!! error TS2322:         Property '1' is missing in type '[string]'.
+!!! error TS2322:         Property '1' is missing in type [string]' but present in type '[number, boolean]'.
     f1 = f4;  // Error, misaligned complex rest types
     ~~
 !!! error TS2322: Type '(...args: [string, string] | [string, number, boolean]) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
@@ -103,8 +94,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
                         ~~~
 !!! error TS2345: Argument of type '<T extends any[]>(cb: (...args: T) => void) => void' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
 !!! error TS2345:   Types of parameters 'cb' and 'args' are incompatible.
-!!! error TS2345:     Type 'CoolArray<any>' is not assignable to type '[(...args: any[]) => void]'.
-!!! error TS2345:       Property '0' is missing in type 'CoolArray<any>'.
+!!! error TS2345:     Property '0' is missing in type CoolArray<any>' but present in type '[(...args: any[]) => void]'.
     
     function bar<T extends any[]>(...args: T): T {
         return args;
@@ -113,28 +103,23 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     let a = bar(10, 20);
     let b = bar<CoolArray<number>>(10, 20);  // Error
                                    ~~
-!!! error TS2345: Argument of type '[10, 20]' is not assignable to parameter of type 'CoolArray<number>'.
-!!! error TS2345:   Property 'hello' is missing in type '[10, 20]'.
+!!! error TS2737: Property 'hello' is missing in type [10, 20]' but present in type 'CoolArray<number>'.
     
     declare function baz<T>(...args: CoolArray<T>): void;
     declare const ca: CoolArray<number>;
     
     baz();       // Error
     ~~~~~
-!!! error TS2345: Argument of type '[]' is not assignable to parameter of type 'CoolArray<never>'.
-!!! error TS2345:   Property 'hello' is missing in type '[]'.
+!!! error TS2737: Property 'hello' is missing in type []' but present in type 'CoolArray<never>'.
     baz(1);      // Error
         ~
-!!! error TS2345: Argument of type '[number]' is not assignable to parameter of type 'CoolArray<{}>'.
-!!! error TS2345:   Property 'hello' is missing in type '[number]'.
+!!! error TS2737: Property 'hello' is missing in type [number]' but present in type 'CoolArray<{}>'.
     baz(1, 2);   // Error
         ~
-!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type 'CoolArray<{}>'.
-!!! error TS2345:   Property 'hello' is missing in type '[number, number]'.
+!!! error TS2737: Property 'hello' is missing in type [number, number]' but present in type 'CoolArray<{}>'.
     baz(...ca);  // Error
         ~~~~~
-!!! error TS2345: Argument of type 'number[]' is not assignable to parameter of type 'CoolArray<number>'.
-!!! error TS2345:   Property 'hello' is missing in type 'number[]'.
+!!! error TS2737: Property 'hello' is missing in type number[]' but present in type 'CoolArray<number>'.
     
     // Repro from #26491
     
@@ -144,6 +129,5 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     hmm("what"); // no error?  A = [] | [number, string] ?
         ~~~~~~
 !!! error TS2345: Argument of type '["what"]' is not assignable to parameter of type '[] | [number, string]'.
-!!! error TS2345:   Type '["what"]' is not assignable to type '[number, string]'.
-!!! error TS2345:     Property '1' is missing in type '["what"]'.
+!!! error TS2345:   Property '1' is missing in type ["what"]' but present in type '[number, string]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions2.errors.txt b/tests/baselines/reference/genericTypeAssertions2.errors.txt
index df3093cbc8ad9..72c3dac76e568 100644
--- a/tests/baselines/reference/genericTypeAssertions2.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions2.errors.txt
@@ -4,9 +4,8 @@ tests/cases/compiler/genericTypeAssertions2.ts(10,5): error TS2322: Type 'B<stri
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericTypeAssertions2.ts(11,5): error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
-  Property 'bar' is missing in type 'A<number>'.
-tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Conversion of type 'undefined[]' to type 'A<number>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'foo' is missing in type 'undefined[]'.
+  Property 'bar' is missing in type A<number>' but present in type 'B<number>'.
+tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'foo' is missing in type undefined[]' but present in type 'A<number>'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions2.ts (3 errors) ====
@@ -29,9 +28,8 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Conversion
     var r3: B<number> = <A<number>>new B(); // error
         ~~
 !!! error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
-!!! error TS2322:   Property 'bar' is missing in type 'A<number>'.
+!!! error TS2322:   Property 'bar' is missing in type A<number>' but present in type 'B<number>'.
     var r4: A<number> = <A<number>>new A();
     var r5: A<number> = <A<number>>[]; // error
                         ~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'undefined[]' to type 'A<number>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'foo' is missing in type 'undefined[]'.
\ No newline at end of file
+!!! error TS2737: Property 'foo' is missing in type undefined[]' but present in type 'A<number>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeConstraints.errors.txt b/tests/baselines/reference/genericTypeConstraints.errors.txt
index ae97572b56ac0..58f72105a9307 100644
--- a/tests/baselines/reference/genericTypeConstraints.errors.txt
+++ b/tests/baselines/reference/genericTypeConstraints.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
-  Property 'fooMethod' is missing in type 'FooExtended'.
+tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2737: Property 'fooMethod' is missing in type FooExtended' but present in type 'Foo'.
 
 
 ==== tests/cases/compiler/genericTypeConstraints.ts (1 errors) ====
@@ -13,8 +12,7 @@ tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2344: Type 'FooExt
     
     class BarExtended extends Bar<FooExtended> {
                                   ~~~~~~~~~~~
-!!! error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
-!!! error TS2344:   Property 'fooMethod' is missing in type 'FooExtended'.
+!!! error TS2737: Property 'fooMethod' is missing in type FooExtended' but present in type 'Foo'.
         constructor() {
             super();
         }
diff --git a/tests/baselines/reference/generics1.errors.txt b/tests/baselines/reference/generics1.errors.txt
index 6279c0dcd6332..3547117b35d71 100644
--- a/tests/baselines/reference/generics1.errors.txt
+++ b/tests/baselines/reference/generics1.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/generics1.ts(10,14): error TS2344: Type 'A' does not satisfy the constraint 'B'.
-  Property 'b' is missing in type 'A'.
+tests/cases/compiler/generics1.ts(10,14): error TS2737: Property 'b' is missing in type A' but present in type 'B'.
 tests/cases/compiler/generics1.ts(13,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 
@@ -16,8 +15,7 @@ tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' re
     var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2344: Type 'A' does not satisfy the constraint 'B'.
-!!! error TS2344:   Property 'b' is missing in type 'A'.
+!!! error TS2737: Property 'b' is missing in type A' but present in type 'B'.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
     var v6: G<any>;                // Error, wrong number of arguments
diff --git a/tests/baselines/reference/generics2.errors.txt b/tests/baselines/reference/generics2.errors.txt
index d44bc7baad8df..6183398eb4f77 100644
--- a/tests/baselines/reference/generics2.errors.txt
+++ b/tests/baselines/reference/generics2.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/generics2.ts(17,14): error TS2344: Type 'A' does not satisfy the constraint 'B'.
-  Property 'b' is missing in type 'A'.
+tests/cases/compiler/generics2.ts(17,14): error TS2737: Property 'b' is missing in type A' but present in type 'B'.
 tests/cases/compiler/generics2.ts(20,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 
@@ -23,8 +22,7 @@ tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' re
     var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2344: Type 'A' does not satisfy the constraint 'B'.
-!!! error TS2344:   Property 'b' is missing in type 'A'.
+!!! error TS2737: Property 'b' is missing in type A' but present in type 'B'.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
     var v6: G<any>;                // Error, wrong number of arguments
diff --git a/tests/baselines/reference/generics5.errors.txt b/tests/baselines/reference/generics5.errors.txt
index fd21a70543645..bdbd5914eea5b 100644
--- a/tests/baselines/reference/generics5.errors.txt
+++ b/tests/baselines/reference/generics5.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/generics5.ts(10,14): error TS2344: Type 'A' does not satisfy the constraint 'B'.
-  Property 'b' is missing in type 'A'.
+tests/cases/compiler/generics5.ts(10,14): error TS2737: Property 'b' is missing in type A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/generics5.ts (1 errors) ====
@@ -14,7 +13,6 @@ tests/cases/compiler/generics5.ts(10,14): error TS2344: Type 'A' does not satisf
     
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2344: Type 'A' does not satisfy the constraint 'B'.
-!!! error TS2344:   Property 'b' is missing in type 'A'.
+!!! error TS2737: Property 'b' is missing in type A' but present in type 'B'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
index a38c477f11141..7eb94af6d907a 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(9,7): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-  Property 'y' is missing in type 'Bar'.
+  Type 'Bar' is missing the following properties from type 'I': y, x
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(12,7): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'x' is missing in type 'Bar2'.
+  Property 'x' is missing in type Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(16,7): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
   Property 'x' is private in type 'I' but not in type 'Bar3'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(21,7): error TS2420: Class 'Bar4' incorrectly implements interface 'I'.
@@ -20,13 +20,13 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
     class Bar implements I { // error
           ~~~
 !!! error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type 'Bar'.
+!!! error TS2420:   Type 'Bar' is missing the following properties from type 'I': y, x
     }
     
     class Bar2 implements I { // error
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'x' is missing in type 'Bar2'.
+!!! error TS2420:   Property 'x' is missing in type Bar2' but present in type 'I'.
         y: number;
     }
     
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
index ec5c1eba68c9a..bed2955ce6cdf 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
@@ -9,23 +9,23 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(42,11): error TS2415: Class 'Bar2' incorrectly extends base class 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(42,11): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'z' is missing in type 'Bar2'.
+  Property 'z' is missing in type Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(47,11): error TS2415: Class 'Bar3' incorrectly extends base class 'Foo'.
   Types have separate declarations of a private property 'x'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(47,11): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-  Property 'z' is missing in type 'Bar3'.
+  Property 'z' is missing in type Bar3' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(67,11): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-  Property 'y' is missing in type 'Bar'.
+  Property 'y' is missing in type Bar' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(73,16): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(74,16): error TS2339: Property 'y' does not exist on type 'Bar'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(76,11): error TS2415: Class 'Bar2' incorrectly extends base class 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(76,11): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'y' is missing in type 'Bar2'.
+  Property 'y' is missing in type Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2415: Class 'Bar3' incorrectly extends base class 'Foo'.
   Types have separate declarations of a private property 'x'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-  Property 'y' is missing in type 'Bar3'.
+  Property 'y' is missing in type Bar3' but present in type 'I'.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts (15 errors) ====
@@ -88,7 +88,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
               ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'z' is missing in type 'Bar2'.
+!!! error TS2420:   Property 'z' is missing in type Bar2' but present in type 'I'.
             x: string;
             y: number;
         }
@@ -99,7 +99,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Types have separate declarations of a private property 'x'.
               ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'z' is missing in type 'Bar3'.
+!!! error TS2420:   Property 'z' is missing in type Bar3' but present in type 'I'.
             private x: string;
             y: number;
         }
@@ -122,7 +122,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
         class Bar extends Foo implements I { // error
               ~~~
 !!! error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type 'Bar'.
+!!! error TS2420:   Property 'y' is missing in type Bar' but present in type 'I'.
             z: number;
         }
     
@@ -141,7 +141,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
               ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type 'Bar2'.
+!!! error TS2420:   Property 'y' is missing in type Bar2' but present in type 'I'.
             x: string;
             z: number;
         }
@@ -152,7 +152,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Types have separate declarations of a private property 'x'.
               ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type 'Bar3'.
+!!! error TS2420:   Property 'y' is missing in type Bar3' but present in type 'I'.
             private x: string;
             z: number;
         }
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
index 3835408ab0534..7f5e6617d9200 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(9,7): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-  Property 'y' is missing in type 'Bar'.
+  Type 'Bar' is missing the following properties from type 'I': y, x
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(12,7): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'x' is missing in type 'Bar2'.
+  Property 'x' is missing in type Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(16,7): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
   Property 'x' is protected but type 'Bar3' is not a class derived from 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(21,7): error TS2420: Class 'Bar4' incorrectly implements interface 'I'.
   Property 'x' is protected but type 'Bar4' is not a class derived from 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(26,7): error TS2420: Class 'Bar5' incorrectly implements interface 'I'.
-  Property 'y' is missing in type 'Bar5'.
+  Property 'y' is missing in type Bar5' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(29,7): error TS2420: Class 'Bar6' incorrectly implements interface 'I'.
   Property 'y' is protected in type 'Bar6' but public in type 'I'.
 
@@ -24,13 +24,13 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
     class Bar implements I { // error
           ~~~
 !!! error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type 'Bar'.
+!!! error TS2420:   Type 'Bar' is missing the following properties from type 'I': y, x
     }
     
     class Bar2 implements I { // error
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'x' is missing in type 'Bar2'.
+!!! error TS2420:   Property 'x' is missing in type Bar2' but present in type 'I'.
         y: number;
     }
     
@@ -53,7 +53,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
     class Bar5 extends Foo implements I { // error
           ~~~~
 !!! error TS2420: Class 'Bar5' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type 'Bar5'.
+!!! error TS2420:   Property 'y' is missing in type Bar5' but present in type 'I'.
     }
     
     class Bar6 extends Foo implements I { // error
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
index 89a1724ea9aa5..16cb707ca9b8b 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
@@ -1,9 +1,8 @@
 tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-    Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
+    Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
 tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not comparable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-    Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
+  Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
 
 
 ==== tests/cases/conformance/dynamicImport/anotherModule.ts (0 errors) ====
@@ -20,11 +19,10 @@ tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of ty
         ~~
 !!! error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
 !!! error TS2322:   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-!!! error TS2322:     Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
+!!! error TS2322:     Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
     let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not comparable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-!!! error TS2352:     Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
+!!! error TS2352:   Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
     let p3: Promise<any> = import("./defaultPath");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/incompatibleTypes.errors.txt b/tests/baselines/reference/incompatibleTypes.errors.txt
index 1951e363eec7a..1e3ad1fa5c5b9 100644
--- a/tests/baselines/reference/incompatibleTypes.errors.txt
+++ b/tests/baselines/reference/incompatibleTypes.errors.txt
@@ -9,7 +9,7 @@ tests/cases/compiler/incompatibleTypes.ts(26,12): error TS2416: Property 'p1' in
   Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/incompatibleTypes.ts(34,12): error TS2416: Property 'p1' in type 'C4' is not assignable to the same property in base type 'IFoo4'.
   Type '{ c: { b: string; }; d: string; }' is not assignable to type '{ a: { a: string; }; b: string; }'.
-    Property 'a' is missing in type '{ c: { b: string; }; d: string; }'.
+    Type '{ c: { b: string; }; d: string; }' is missing the following properties from type '{ a: { a: string; }; b: string; }': a, b
 tests/cases/compiler/incompatibleTypes.ts(42,5): error TS2345: Argument of type 'C1' is not assignable to parameter of type 'IFoo2'.
   Types of property 'p1' are incompatible.
     Type '() => string' is not assignable to type '(s: string) => number'.
@@ -72,7 +72,7 @@ tests/cases/compiler/incompatibleTypes.ts(74,5): error TS2322: Type '(a: any) =>
                ~~
 !!! error TS2416: Property 'p1' in type 'C4' is not assignable to the same property in base type 'IFoo4'.
 !!! error TS2416:   Type '{ c: { b: string; }; d: string; }' is not assignable to type '{ a: { a: string; }; b: string; }'.
-!!! error TS2416:     Property 'a' is missing in type '{ c: { b: string; }; d: string; }'.
+!!! error TS2416:     Type '{ c: { b: string; }; d: string; }' is missing the following properties from type '{ a: { a: string; }; b: string; }': a, b
     }
     
     function if1(i: IFoo1): void;
diff --git a/tests/baselines/reference/inheritance1.errors.txt b/tests/baselines/reference/inheritance1.errors.txt
index d980b884ebff7..1fa269862aafe 100644
--- a/tests/baselines/reference/inheritance1.errors.txt
+++ b/tests/baselines/reference/inheritance1.errors.txt
@@ -1,27 +1,27 @@
 tests/cases/compiler/inheritance1.ts(14,7): error TS2420: Class 'ImageBase' incorrectly implements interface 'SelectableControl'.
-  Property 'select' is missing in type 'ImageBase'.
+  Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(18,7): error TS2420: Class 'Locations' incorrectly implements interface 'SelectableControl'.
-  Property 'state' is missing in type 'Locations'.
+  Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(31,1): error TS2322: Type 'Control' is not assignable to type 'Button'.
-  Property 'select' is missing in type 'Control'.
+  Property 'select' is missing in type Control' but present in type 'Button'.
 tests/cases/compiler/inheritance1.ts(37,1): error TS2322: Type 'Control' is not assignable to type 'TextBox'.
-  Property 'select' is missing in type 'Control'.
+  Property 'select' is missing in type Control' but present in type 'TextBox'.
 tests/cases/compiler/inheritance1.ts(40,1): error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
-  Property 'select' is missing in type 'ImageBase'.
+  Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(46,1): error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
-  Property 'select' is missing in type 'Image1'.
+  Property 'select' is missing in type Image1' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(52,1): error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
-  Property 'state' is missing in type 'Locations'.
+  Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(53,1): error TS2322: Type 'Locations' is not assignable to type 'Control'.
-  Property 'state' is missing in type 'Locations'.
+  Property 'state' is missing in type Locations' but present in type 'Control'.
 tests/cases/compiler/inheritance1.ts(55,1): error TS2322: Type 'Control' is not assignable to type 'Locations'.
-  Property 'select' is missing in type 'Control'.
+  Property 'select' is missing in type Control' but present in type 'Locations'.
 tests/cases/compiler/inheritance1.ts(58,1): error TS2322: Type 'Locations1' is not assignable to type 'SelectableControl'.
-  Property 'state' is missing in type 'Locations1'.
+  Property 'state' is missing in type Locations1' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(59,1): error TS2322: Type 'Locations1' is not assignable to type 'Control'.
-  Property 'state' is missing in type 'Locations1'.
+  Property 'state' is missing in type Locations1' but present in type 'Control'.
 tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not assignable to type 'Locations1'.
-  Property 'select' is missing in type 'Control'.
+  Property 'select' is missing in type Control' but present in type 'Locations1'.
 
 
 ==== tests/cases/compiler/inheritance1.ts (12 errors) ====
@@ -41,14 +41,14 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     class ImageBase extends Control implements SelectableControl{
           ~~~~~~~~~
 !!! error TS2420: Class 'ImageBase' incorrectly implements interface 'SelectableControl'.
-!!! error TS2420:   Property 'select' is missing in type 'ImageBase'.
+!!! error TS2420:   Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
     }
     class Image1 extends Control {
     }
     class Locations implements SelectableControl {
           ~~~~~~~~~
 !!! error TS2420: Class 'Locations' incorrectly implements interface 'SelectableControl'.
-!!! error TS2420:   Property 'state' is missing in type 'Locations'.
+!!! error TS2420:   Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
         select() { }
     }
     class Locations1 {
@@ -64,7 +64,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     b = c;
     ~
 !!! error TS2322: Type 'Control' is not assignable to type 'Button'.
-!!! error TS2322:   Property 'select' is missing in type 'Control'.
+!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'Button'.
     
     var t: TextBox;
     sc = t;
@@ -73,13 +73,13 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     t = c;
     ~
 !!! error TS2322: Type 'Control' is not assignable to type 'TextBox'.
-!!! error TS2322:   Property 'select' is missing in type 'Control'.
+!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'TextBox'.
     
     var i: ImageBase;
     sc = i;
     ~~
 !!! error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'select' is missing in type 'ImageBase'.
+!!! error TS2322:   Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
     c = i;
     i = sc;
     i = c;
@@ -88,7 +88,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     sc = i1;
     ~~
 !!! error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'select' is missing in type 'Image1'.
+!!! error TS2322:   Property 'select' is missing in type Image1' but present in type 'SelectableControl'.
     c = i1;
     i1 = sc;
     i1 = c;
@@ -97,28 +97,28 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     sc = l;
     ~~
 !!! error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations'.
+!!! error TS2322:   Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
     c = l;
     ~
 !!! error TS2322: Type 'Locations' is not assignable to type 'Control'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations'.
+!!! error TS2322:   Property 'state' is missing in type Locations' but present in type 'Control'.
     l = sc;
     l = c;
     ~
 !!! error TS2322: Type 'Control' is not assignable to type 'Locations'.
-!!! error TS2322:   Property 'select' is missing in type 'Control'.
+!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'Locations'.
     
     var l1: Locations1;
     sc = l1;
     ~~
 !!! error TS2322: Type 'Locations1' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations1'.
+!!! error TS2322:   Property 'state' is missing in type Locations1' but present in type 'SelectableControl'.
     c = l1;
     ~
 !!! error TS2322: Type 'Locations1' is not assignable to type 'Control'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations1'.
+!!! error TS2322:   Property 'state' is missing in type Locations1' but present in type 'Control'.
     l1 = sc;
     l1 = c;
     ~~
 !!! error TS2322: Type 'Control' is not assignable to type 'Locations1'.
-!!! error TS2322:   Property 'select' is missing in type 'Control'.
\ No newline at end of file
+!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'Locations1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
index aa45083779804..b316320524680 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
@@ -1,17 +1,16 @@
 tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-  Property '__predomBrand' is missing in type 'Element'.
+  Property '__predomBrand' is missing in type Element' but present in type 'Element'.
 tests/cases/conformance/jsx/inline/index.tsx(21,22): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
-  Property '__domBrand' is missing in type 'MyClass'.
+tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2737: Property '__domBrand' is missing in type MyClass' but present in type 'ElementClass'.
 tests/cases/conformance/jsx/inline/index.tsx(21,63): error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
 tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
       Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
-        Property '__domBrand' is missing in type 'Element'.
+        Property '__domBrand' is missing in type Element' but present in type 'Element'.
 
 
 ==== tests/cases/conformance/jsx/inline/renderer.d.ts (0 errors) ====
@@ -82,7 +81,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
     elem = <h></h>; // Expect assignability error here
     ~~~~
 !!! error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-!!! error TS2322:   Property '__predomBrand' is missing in type 'Element'.
+!!! error TS2322:   Property '__predomBrand' is missing in type Element' but present in type 'Element'.
     
     const DOMSFC = (props: {x: number, y: number, children?: dom.JSX.Element[]}) => <p>{props.x} + {props.y} = {props.x + props.y}{props.children}</p>;
     
@@ -105,8 +104,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
 !!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
-!!! error TS2605:   Property '__domBrand' is missing in type 'MyClass'.
+!!! error TS2737: Property '__domBrand' is missing in type MyClass' but present in type 'ElementClass'.
                                                                   ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
     
@@ -117,5 +115,5 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:   Types of property 'children' are incompatible.
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
 !!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
-!!! error TS2322:         Property '__domBrand' is missing in type 'Element'.
+!!! error TS2322:         Property '__domBrand' is missing in type Element' but present in type 'Element'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
index db97f133ea208..229072931d732 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-  Property '__predomBrand' is missing in type 'Element'.
+  Property '__predomBrand' is missing in type Element' but present in type 'Element'.
 
 
 ==== tests/cases/conformance/jsx/inline/renderer.d.ts (0 errors) ====
@@ -47,5 +47,5 @@ tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'JSX.Eleme
     elem = <h></h>; // Expect assignability error here
     ~~~~
 !!! error TS2322: Type 'JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-!!! error TS2322:   Property '__predomBrand' is missing in type 'Element'.
+!!! error TS2322:   Property '__predomBrand' is missing in type Element' but present in type 'Element'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intTypeCheck.errors.txt b/tests/baselines/reference/intTypeCheck.errors.txt
index 5b7ca138339b8..a0e9ca0a9e515 100644
--- a/tests/baselines/reference/intTypeCheck.errors.txt
+++ b/tests/baselines/reference/intTypeCheck.errors.txt
@@ -3,12 +3,12 @@ tests/cases/compiler/intTypeCheck.ts(71,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/intTypeCheck.ts(85,5): error TS2386: Overload signatures must all be optional or required.
 tests/cases/compiler/intTypeCheck.ts(99,5): error TS2322: Type 'Object' is not assignable to type 'i1'.
   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Property 'p' is missing in type 'Object'.
+    Type 'Object' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(100,16): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/intTypeCheck.ts(101,5): error TS2322: Type 'Base' is not assignable to type 'i1'.
-  Property 'p' is missing in type 'Base'.
+  Type 'Base' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(103,5): error TS2322: Type '() => void' is not assignable to type 'i1'.
-  Property 'p' is missing in type '() => void'.
+  Type '() => void' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(106,5): error TS2322: Type 'boolean' is not assignable to type 'i1'.
 tests/cases/compiler/intTypeCheck.ts(106,20): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(106,21): error TS2693: 'i1' only refers to a type, but is being used as a value here.
@@ -44,15 +44,15 @@ tests/cases/compiler/intTypeCheck.ts(148,21): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(148,22): error TS2693: 'i4' only refers to a type, but is being used as a value here.
 tests/cases/compiler/intTypeCheck.ts(149,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/intTypeCheck.ts(154,5): error TS2322: Type '{}' is not assignable to type 'i5'.
-  Property 'p' is missing in type '{}'.
+  Type '{}' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(155,5): error TS2322: Type 'Object' is not assignable to type 'i5'.
   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Property 'p' is missing in type 'Object'.
+    Type 'Object' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(156,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/intTypeCheck.ts(157,5): error TS2322: Type 'Base' is not assignable to type 'i5'.
-  Property 'p' is missing in type 'Base'.
+  Type 'Base' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(159,5): error TS2322: Type '() => void' is not assignable to type 'i5'.
-  Property 'p' is missing in type '() => void'.
+  Type '() => void' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(162,5): error TS2322: Type 'boolean' is not assignable to type 'i5'.
 tests/cases/compiler/intTypeCheck.ts(162,21): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(162,22): error TS2693: 'i5' only refers to a type, but is being used as a value here.
@@ -200,19 +200,19 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
         ~~~~
 !!! error TS2322: Type 'Object' is not assignable to type 'i1'.
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Property 'p' is missing in type 'Object'.
+!!! error TS2322:     Type 'Object' is missing the following properties from type 'i1': p, p3, p6
     var obj3: i1 = new obj0;
                    ~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     var obj4: i1 = new Base;
         ~~~~
 !!! error TS2322: Type 'Base' is not assignable to type 'i1'.
-!!! error TS2322:   Property 'p' is missing in type 'Base'.
+!!! error TS2322:   Type 'Base' is missing the following properties from type 'i1': p, p3, p6
     var obj5: i1 = null;
     var obj6: i1 = function () { };
         ~~~~
 !!! error TS2322: Type '() => void' is not assignable to type 'i1'.
-!!! error TS2322:   Property 'p' is missing in type '() => void'.
+!!! error TS2322:   Type '() => void' is missing the following properties from type 'i1': p, p3, p6
     //var obj7: i1 = function foo() { };
     var obj8: i1 = <i1> anyVar;
     var obj9: i1 = new <i1> anyVar;
@@ -325,24 +325,24 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
     var obj45: i5 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i5'.
-!!! error TS2322:   Property 'p' is missing in type '{}'.
+!!! error TS2322:   Type '{}' is missing the following properties from type 'i5': p, p3, p6
     var obj46: i5 = new Object();
         ~~~~~
 !!! error TS2322: Type 'Object' is not assignable to type 'i5'.
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Property 'p' is missing in type 'Object'.
+!!! error TS2322:     Type 'Object' is missing the following properties from type 'i5': p, p3, p6
     var obj47: i5 = new obj44;
                     ~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     var obj48: i5 = new Base;
         ~~~~~
 !!! error TS2322: Type 'Base' is not assignable to type 'i5'.
-!!! error TS2322:   Property 'p' is missing in type 'Base'.
+!!! error TS2322:   Type 'Base' is missing the following properties from type 'i5': p, p3, p6
     var obj49: i5 = null;
     var obj50: i5 = function () { };
         ~~~~~
 !!! error TS2322: Type '() => void' is not assignable to type 'i5'.
-!!! error TS2322:   Property 'p' is missing in type '() => void'.
+!!! error TS2322:   Type '() => void' is missing the following properties from type 'i5': p, p3, p6
     //var obj51: i5 = function foo() { };
     var obj52: i5 = <i5> anyVar;
     var obj53: i5 = new <i5> anyVar;
diff --git a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
index df06eb1bd6c9d..25f5ea06f4d7d 100644
--- a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/interfaceAssignmentCompat.ts(32,18): error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
   Types of parameters 'a' and 'a' are incompatible.
-    Type 'IEye' is not assignable to type 'IFrenchEye'.
-      Property 'coleur' is missing in type 'IEye'.
+    Property 'coleur' is missing in type IEye' but present in type 'IFrenchEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(37,29): error TS2339: Property '_map' does not exist on type 'typeof Color'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(42,13): error TS2322: Type 'IEye' is not assignable to type 'IFrenchEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEye[]' is not assignable to type 'IFrenchEye[]'.
@@ -44,8 +43,7 @@ tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEy
                      ~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
 !!! error TS2345:   Types of parameters 'a' and 'a' are incompatible.
-!!! error TS2345:     Type 'IEye' is not assignable to type 'IFrenchEye'.
-!!! error TS2345:       Property 'coleur' is missing in type 'IEye'.
+!!! error TS2345:     Property 'coleur' is missing in type IEye' but present in type 'IFrenchEye'.
             // type of z inferred from specialized array type
             var z=x.sort(CompareEyes); // ok
     
diff --git a/tests/baselines/reference/interfaceDeclaration1.errors.txt b/tests/baselines/reference/interfaceDeclaration1.errors.txt
index 5a6b07fd0d681..caf17d04df8b3 100644
--- a/tests/baselines/reference/interfaceDeclaration1.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration1.errors.txt
@@ -5,7 +5,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(8,5): error TS2300: Duplicate iden
 tests/cases/compiler/interfaceDeclaration1.ts(8,5): error TS2717: Subsequent property declarations must have the same type.  Property 'item' must be of type 'any', but here has type 'number'.
 tests/cases/compiler/interfaceDeclaration1.ts(22,11): error TS2310: Type 'I5' recursively references itself as a base type.
 tests/cases/compiler/interfaceDeclaration1.ts(35,7): error TS2420: Class 'C1' incorrectly implements interface 'I3'.
-  Property 'prototype' is missing in type 'C1'.
+  Property 'prototype' is missing in type C1' but present in type 'I3'.
 tests/cases/compiler/interfaceDeclaration1.ts(41,11): error TS2310: Type 'i8' recursively references itself as a base type.
 tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i12' cannot simultaneously extend types 'i10' and 'i11'.
   Named property 'foo' of types 'i10' and 'i11' are not identical.
@@ -61,7 +61,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i
     class C1 implements I3 {
           ~~
 !!! error TS2420: Class 'C1' incorrectly implements interface 'I3'.
-!!! error TS2420:   Property 'prototype' is missing in type 'C1'.
+!!! error TS2420:   Property 'prototype' is missing in type C1' but present in type 'I3'.
         constructor() {
             var prototype: number = 3;
         }
diff --git a/tests/baselines/reference/interfaceDeclaration4.errors.txt b/tests/baselines/reference/interfaceDeclaration4.errors.txt
index d59f063ea1171..7fea572f06cc4 100644
--- a/tests/baselines/reference/interfaceDeclaration4.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration4.errors.txt
@@ -2,9 +2,9 @@ tests/cases/compiler/interfaceDeclaration4.ts(18,11): error TS2430: Interface 'I
   Types of property 'item' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/interfaceDeclaration4.ts(27,7): error TS2420: Class 'C2' incorrectly implements interface 'I4'.
-  Property 'item' is missing in type 'C2'.
+  Property 'item' is missing in type C2' but present in type 'I4'.
 tests/cases/compiler/interfaceDeclaration4.ts(36,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-  Property 'item' is missing in type 'C3'.
+  Property 'item' is missing in type C3' but present in type 'I1'.
 tests/cases/compiler/interfaceDeclaration4.ts(39,14): error TS1005: '{' expected.
 tests/cases/compiler/interfaceDeclaration4.ts(39,15): error TS2304: Cannot find name 'I1'.
 tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected.
@@ -44,7 +44,7 @@ tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected
     class C2 implements I4 {
           ~~
 !!! error TS2420: Class 'C2' incorrectly implements interface 'I4'.
-!!! error TS2420:   Property 'item' is missing in type 'C2'.
+!!! error TS2420:   Property 'item' is missing in type C2' but present in type 'I4'.
         public token: string;
     }
     
@@ -56,7 +56,7 @@ tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected
     class C3 implements Foo.I1 { }
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'item' is missing in type 'C3'.
+!!! error TS2420:   Property 'item' is missing in type C3' but present in type 'I1'.
     
     // Negative case 
     interface Foo.I1 { }
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
index f624560b7c09d..dd39debd6fbfb 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(21,1): error TS2322: Type 'C' is not assignable to type 'I'.
-  Property 'other' is missing in type 'C'.
+  Property 'other' is missing in type C' but present in type 'I'.
 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(24,1): error TS2322: Type 'I' is not assignable to type 'D'.
-  Property 'bar' is missing in type 'I'.
+  Property 'bar' is missing in type I' but present in type 'D'.
 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'other' is missing in type 'C'.
+  Type 'C' is missing the following properties from type 'D': other, bar
 
 
 ==== tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts (3 errors) ====
@@ -30,16 +30,16 @@ tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2322: T
     i = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'I'.
-!!! error TS2322:   Property 'other' is missing in type 'C'.
+!!! error TS2322:   Property 'other' is missing in type C' but present in type 'I'.
     
     i = d;
     d = i; // error
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'D'.
-!!! error TS2322:   Property 'bar' is missing in type 'I'.
+!!! error TS2322:   Property 'bar' is missing in type I' but present in type 'D'.
     
     c = d;
     d = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'other' is missing in type 'C'.
\ No newline at end of file
+!!! error TS2322:   Type 'C' is missing the following properties from type 'D': other, bar
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceImplementation2.errors.txt b/tests/baselines/reference/interfaceImplementation2.errors.txt
index eedc3a4f74679..9df5edaf47bb0 100644
--- a/tests/baselines/reference/interfaceImplementation2.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/interfaceImplementation2.ts(8,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-  Property 'iFn' is missing in type 'C3'.
+  Property 'iFn' is missing in type C3' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation2.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/interfaceImplementation2.ts(8,7): error TS2420: Class 'C3'
     class C3 implements I1 {
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'iFn' is missing in type 'C3'.
+!!! error TS2420:   Property 'iFn' is missing in type C3' but present in type 'I1'.
         public iObj:{ };
         public iNum:number;
         public iAny:any;
diff --git a/tests/baselines/reference/interfaceImplementation3.errors.txt b/tests/baselines/reference/interfaceImplementation3.errors.txt
index 06baf5d5915a1..491ec880b5d44 100644
--- a/tests/baselines/reference/interfaceImplementation3.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/interfaceImplementation3.ts(8,7): error TS2420: Class 'C4' incorrectly implements interface 'I1'.
-  Property 'iAny' is missing in type 'C4'.
+  Property 'iAny' is missing in type C4' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation3.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/interfaceImplementation3.ts(8,7): error TS2420: Class 'C4'
     class C4 implements I1 {
           ~~
 !!! error TS2420: Class 'C4' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'iAny' is missing in type 'C4'.
+!!! error TS2420:   Property 'iAny' is missing in type C4' but present in type 'I1'.
         public iObj:{ };
         public iNum:number;
         public iFn() { }
diff --git a/tests/baselines/reference/interfaceImplementation4.errors.txt b/tests/baselines/reference/interfaceImplementation4.errors.txt
index f50aa4ade974b..26e664e59ebff 100644
--- a/tests/baselines/reference/interfaceImplementation4.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation4.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/interfaceImplementation4.ts(8,7): error TS2420: Class 'C5' incorrectly implements interface 'I1'.
-  Property 'iObj' is missing in type 'C5'.
+  Property 'iObj' is missing in type C5' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation4.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/interfaceImplementation4.ts(8,7): error TS2420: Class 'C5'
     class C5 implements I1 {
           ~~
 !!! error TS2420: Class 'C5' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'iObj' is missing in type 'C5'.
+!!! error TS2420:   Property 'iObj' is missing in type C5' but present in type 'I1'.
         public iNum:number;
         public iAny:any;
         public iFn() { }
diff --git a/tests/baselines/reference/interfaceImplementation6.errors.txt b/tests/baselines/reference/interfaceImplementation6.errors.txt
index c4c0dcba8aed1..6ecab72530016 100644
--- a/tests/baselines/reference/interfaceImplementation6.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/interfaceImplementation6.ts(9,7): error TS2420: Class 'C2' incorrectly implements interface 'I1'.
   Property 'item' is private in type 'C2' but not in type 'I1'.
 tests/cases/compiler/interfaceImplementation6.ts(13,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-  Property 'item' is missing in type 'C3'.
+  Property 'item' is missing in type C3' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation6.ts (2 errors) ====
@@ -23,7 +23,7 @@ tests/cases/compiler/interfaceImplementation6.ts(13,7): error TS2420: Class 'C3'
     class C3 implements I1 {
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'item' is missing in type 'C3'.
+!!! error TS2420:   Property 'item' is missing in type C3' but present in type 'I1'.
         constructor() {
            var item: number;
         }
diff --git a/tests/baselines/reference/interfaceInheritance.errors.txt b/tests/baselines/reference/interfaceInheritance.errors.txt
index c96053b8a84ca..2b92c3561dfdd 100644
--- a/tests/baselines/reference/interfaceInheritance.errors.txt
+++ b/tests/baselines/reference/interfaceInheritance.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/interfaceInheritance.ts(22,7): error TS2420: Class 'C1' incorrectly implements interface 'I2'.
-  Property 'i1P1' is missing in type 'C1'.
+  Type 'C1' is missing the following properties from type 'I2': i1P1, i1P2
 tests/cases/compiler/interfaceInheritance.ts(30,1): error TS2322: Type 'I3' is not assignable to type 'I2'.
-  Property 'i1P1' is missing in type 'I3'.
+  Type 'I3' is missing the following properties from type 'I2': i1P1, i1P2
 tests/cases/compiler/interfaceInheritance.ts(37,1): error TS2322: Type 'I5' is not assignable to type 'I4'.
   Types of property 'one' are incompatible.
     Type 'string' is not assignable to type 'number'.
@@ -35,7 +35,7 @@ tests/cases/compiler/interfaceInheritance.ts(38,1): error TS2322: Type 'I4' is n
     class C1 implements I2 { // should be an error - it doesn't implement the members of I1
           ~~
 !!! error TS2420: Class 'C1' incorrectly implements interface 'I2'.
-!!! error TS2420:   Property 'i1P1' is missing in type 'C1'.
+!!! error TS2420:   Type 'C1' is missing the following properties from type 'I2': i1P1, i1P2
         public i2P1: string;
     }
     
@@ -46,7 +46,7 @@ tests/cases/compiler/interfaceInheritance.ts(38,1): error TS2322: Type 'I4' is n
     i2 = i3; // should be an error - i3 does not implement the members of i1
     ~~
 !!! error TS2322: Type 'I3' is not assignable to type 'I2'.
-!!! error TS2322:   Property 'i1P1' is missing in type 'I3'.
+!!! error TS2322:   Type 'I3' is missing the following properties from type 'I2': i1P1, i1P2
     
     var c1: C1;
     
diff --git a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
index 62ddfd497a3db..711c48aba09b7 100644
--- a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
+++ b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
@@ -1,35 +1,35 @@
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(19,1): error TS2322: Type 'A' is not assignable to type 'A & B'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A'.
+    Property 'b' is missing in type A' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(20,1): error TS2322: Type 'B' is not assignable to type 'A & B'.
   Type 'B' is not assignable to type 'A'.
-    Property 'a' is missing in type 'B'.
+    Property 'a' is missing in type B' but present in type 'A'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(23,1): error TS2322: Type 'A | B' is not assignable to type '(A & B) | (C & D)'.
   Type 'A' is not assignable to type '(A & B) | (C & D)'.
     Type 'A' is not assignable to type 'C & D'.
       Type 'A' is not assignable to type 'C'.
-        Property 'c' is missing in type 'A'.
+        Property 'c' is missing in type A' but present in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(25,1): error TS2322: Type 'C | D' is not assignable to type '(A & B) | (C & D)'.
   Type 'C' is not assignable to type '(A & B) | (C & D)'.
     Type 'C' is not assignable to type 'C & D'.
       Type 'C' is not assignable to type 'D'.
-        Property 'd' is missing in type 'C'.
+        Property 'd' is missing in type C' but present in type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(26,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
   Type 'C & D' is not assignable to type 'A & B'.
     Type 'C & D' is not assignable to type 'A'.
-      Property 'a' is missing in type 'C & D'.
+      Property 'a' is missing in type C & D' but present in type 'A'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(27,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
   Type 'C & D' is not assignable to type 'A | B'.
     Type 'C & D' is not assignable to type 'B'.
-      Property 'b' is missing in type 'C & D'.
+      Property 'b' is missing in type C & D' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(28,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
   Type 'A & B' is not assignable to type 'C & D'.
     Type 'A & B' is not assignable to type 'C'.
-      Property 'c' is missing in type 'A & B'.
+      Property 'c' is missing in type A & B' but present in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(29,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
   Type 'A & B' is not assignable to type 'C | D'.
     Type 'A & B' is not assignable to type 'D'.
-      Property 'd' is missing in type 'A & B'.
+      Property 'd' is missing in type A & B' but present in type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(31,1): error TS2322: Type 'A & B' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
   Type 'A & B' is not assignable to type 'B & D'.
     Type 'A & B' is not assignable to type 'D'.
@@ -44,15 +44,15 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(34,1): e
   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
     Type 'C' is not assignable to type 'B & D'.
       Type 'C' is not assignable to type 'B'.
-        Property 'b' is missing in type 'C'.
+        Property 'b' is missing in type C' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(35,1): error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
   Type 'A & C' is not assignable to type 'A & B'.
     Type 'A & C' is not assignable to type 'B'.
-      Property 'b' is missing in type 'A & C'.
+      Property 'b' is missing in type A & C' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
   Type 'A & C' is not assignable to type 'C & D'.
     Type 'A & C' is not assignable to type 'D'.
-      Property 'd' is missing in type 'A & C'.
+      Property 'd' is missing in type A & C' but present in type 'D'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts (14 errors) ====
@@ -78,12 +78,12 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
     ~~~
 !!! error TS2322: Type 'A' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A'.
+!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
     anb = b;
     ~~~
 !!! error TS2322: Type 'B' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'B' is not assignable to type 'A'.
-!!! error TS2322:     Property 'a' is missing in type 'B'.
+!!! error TS2322:     Property 'a' is missing in type B' but present in type 'A'.
     
     x = anb;  // Ok
     x = aob;
@@ -92,7 +92,7 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'A' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'A' is not assignable to type 'C & D'.
 !!! error TS2322:       Type 'A' is not assignable to type 'C'.
-!!! error TS2322:         Property 'c' is missing in type 'A'.
+!!! error TS2322:         Property 'c' is missing in type A' but present in type 'C'.
     x = cnd;  // Ok
     x = cod;
     ~
@@ -100,31 +100,31 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'C' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'C & D'.
 !!! error TS2322:       Type 'C' is not assignable to type 'D'.
-!!! error TS2322:         Property 'd' is missing in type 'C'.
+!!! error TS2322:         Property 'd' is missing in type C' but present in type 'D'.
     anb = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A & B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'A'.
-!!! error TS2322:       Property 'a' is missing in type 'C & D'.
+!!! error TS2322:       Property 'a' is missing in type C & D' but present in type 'A'.
     aob = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A | B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'B'.
-!!! error TS2322:       Property 'b' is missing in type 'C & D'.
+!!! error TS2322:       Property 'b' is missing in type C & D' but present in type 'B'.
     cnd = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C & D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'C'.
-!!! error TS2322:       Property 'c' is missing in type 'A & B'.
+!!! error TS2322:       Property 'c' is missing in type A & B' but present in type 'C'.
     cod = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C | D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'D'.
-!!! error TS2322:       Property 'd' is missing in type 'A & B'.
+!!! error TS2322:       Property 'd' is missing in type A & B' but present in type 'D'.
     
     y = anb;
     ~
@@ -148,19 +148,19 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'B & D'.
 !!! error TS2322:       Type 'C' is not assignable to type 'B'.
-!!! error TS2322:         Property 'b' is missing in type 'C'.
+!!! error TS2322:         Property 'b' is missing in type C' but present in type 'B'.
     anb = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'A & B'.
 !!! error TS2322:     Type 'A & C' is not assignable to type 'B'.
-!!! error TS2322:       Property 'b' is missing in type 'A & C'.
+!!! error TS2322:       Property 'b' is missing in type A & C' but present in type 'B'.
     aob = y;  // Ok
     cnd = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'C & D'.
 !!! error TS2322:     Type 'A & C' is not assignable to type 'D'.
-!!! error TS2322:       Property 'd' is missing in type 'A & C'.
+!!! error TS2322:       Property 'd' is missing in type A & C' but present in type 'D'.
     cod = y;  // Ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt b/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt
index 69da07115ad8a..34736d7f679f2 100644
--- a/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt
+++ b/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(8,7): error TS2559: Type 'XY' has no properties in common with type 'Z'.
 tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(18,7): error TS2322: Type 'Brand<{ view: number; styleMedia: string; }>' is not assignable to type 'ViewStyle'.
-  Property 'view' is missing in type 'Number & { __brand: { view: number; styleMedia: string; }; }'.
+  Type 'Number & { __brand: { view: number; styleMedia: string; }; }' is missing the following properties from type 'ViewStyle': view, styleMedia
 
 
 ==== tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts (2 errors) ====
@@ -26,5 +26,5 @@ tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(18,7)
     const vs: ViewStyle = wrapped.first // error, first is a branded number
           ~~
 !!! error TS2322: Type 'Brand<{ view: number; styleMedia: string; }>' is not assignable to type 'ViewStyle'.
-!!! error TS2322:   Property 'view' is missing in type 'Number & { __brand: { view: number; styleMedia: string; }; }'.
+!!! error TS2322:   Type 'Number & { __brand: { view: number; styleMedia: string; }; }' is missing the following properties from type 'ViewStyle': view, styleMedia
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionTypeAssignment.errors.txt b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
index 11ea91d8f0e95..d45202e24e033 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.errors.txt
+++ b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(8,1): error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; b: string; }'.
-  Property 'b' is missing in type '{ a: string; }'.
+  Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(9,1): error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
   Type '{ a: string; }' is not assignable to type '{ b: string; }'.
-    Property 'b' is missing in type '{ a: string; }'.
+    Property 'b' is missing in type { a: string; }' but present in type '{ b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(13,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; b: string; }'.
-  Property 'a' is missing in type '{ b: string; }'.
+  Property 'a' is missing in type { b: string; }' but present in type '{ a: string; b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
   Type '{ b: string; }' is not assignable to type '{ a: string; }'.
-    Property 'a' is missing in type '{ b: string; }'.
+    Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts (4 errors) ====
@@ -21,24 +21,24 @@ tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1):
     x = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; b: string; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: string; }'.
+!!! error TS2322:   Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: string; }'.
     y = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Type '{ a: string; }' is not assignable to type '{ b: string; }'.
-!!! error TS2322:     Property 'b' is missing in type '{ a: string; }'.
+!!! error TS2322:     Property 'b' is missing in type { a: string; }' but present in type '{ b: string; }'.
     
     b = x;
     b = y;
     x = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; b: string; }'.
-!!! error TS2322:   Property 'a' is missing in type '{ b: string; }'.
+!!! error TS2322:   Property 'a' is missing in type { b: string; }' but present in type '{ a: string; b: string; }'.
     y = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Type '{ b: string; }' is not assignable to type '{ a: string; }'.
-!!! error TS2322:     Property 'a' is missing in type '{ b: string; }'.
+!!! error TS2322:     Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
     
     x = y;
     y = x;
diff --git a/tests/baselines/reference/invalidReturnStatements.errors.txt b/tests/baselines/reference/invalidReturnStatements.errors.txt
index 0f51e75a47d23..3badd90c6af9c 100644
--- a/tests/baselines/reference/invalidReturnStatements.errors.txt
+++ b/tests/baselines/reference/invalidReturnStatements.errors.txt
@@ -3,9 +3,9 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(3
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(4,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(5,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,22): error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
-  Property 'name' is missing in type '{ id: number; }'.
+  Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,22): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'name' is missing in type 'C'.
+  Property 'name' is missing in type C' but present in type 'D'.
 
 
 ==== tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts (6 errors) ====
@@ -35,11 +35,11 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(1
     function fn10(): D { return { id: 12 }; } 
                          ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
-!!! error TS2322:   Property 'name' is missing in type '{ id: number; }'.
+!!! error TS2322:   Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
     
     function fn11(): D { return new C(); }
                          ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'name' is missing in type 'C'.
+!!! error TS2322:   Property 'name' is missing in type C' but present in type 'D'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern10.errors.txt b/tests/baselines/reference/iterableArrayPattern10.errors.txt
index f0b3e14c9fd24..05465559135b1 100644
--- a/tests/baselines/reference/iterableArrayPattern10.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern10.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, any]'.
-  Property '0' is missing in type 'FooIterator'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts(17,5): error TS2736: Type 'FooIterator' is missing the following properties from type '[any, any]': 0, 1, length, pop, and 26 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts (1 errors) ====
@@ -21,5 +20,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts(17,5): error
     function fun([a, b]) { }
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, any]'.
-!!! error TS2345:   Property '0' is missing in type 'FooIterator'.
\ No newline at end of file
+!!! error TS2736: Type 'FooIterator' is missing the following properties from type '[any, any]': 0, 1, length, pop, and 26 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern13.errors.txt b/tests/baselines/reference/iterableArrayPattern13.errors.txt
index 54c064e9ffc94..bafa8402a405f 100644
--- a/tests/baselines/reference/iterableArrayPattern13.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern13.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, ...any[]]'.
-  Property '0' is missing in type 'FooIterator'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts(17,5): error TS2736: Type 'FooIterator' is missing the following properties from type '[any, ...any[]]': 0, length, pop, push, and 25 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts (1 errors) ====
@@ -21,5 +20,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts(17,5): error
     function fun([a, ...b]) { }
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, ...any[]]'.
-!!! error TS2345:   Property '0' is missing in type 'FooIterator'.
\ No newline at end of file
+!!! error TS2736: Type 'FooIterator' is missing the following properties from type '[any, ...any[]]': 0, length, pop, push, and 25 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern16.errors.txt b/tests/baselines/reference/iterableArrayPattern16.errors.txt
index b07d8c976a506..2f699652e6601 100644
--- a/tests/baselines/reference/iterableArrayPattern16.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern16.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(1,17): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[Bar, Bar]'.
-  Property '0' is missing in type 'FooIterator'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,5): error TS2736: Type 'FooIterator' is missing the following properties from type '[Bar, Bar]': 0, 1, length, pop, and 26 more.
 tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,12): error TS2449: Class 'FooIteratorIterator' used before its declaration.
 
 
@@ -10,8 +9,7 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,12): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     fun(...new FooIteratorIterator);
         ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[Bar, Bar]'.
-!!! error TS2345:   Property '0' is missing in type 'FooIterator'.
+!!! error TS2736: Type 'FooIterator' is missing the following properties from type '[Bar, Bar]': 0, 1, length, pop, and 26 more.
                ~~~~~~~~~~~~~~~~~~~
 !!! error TS2449: Class 'FooIteratorIterator' used before its declaration.
 !!! related TS2728 tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts:18:7: 'FooIteratorIterator' is declared here.
diff --git a/tests/baselines/reference/iterableArrayPattern17.errors.txt b/tests/baselines/reference/iterableArrayPattern17.errors.txt
index d22d8580c719b..c2e98479941e3 100644
--- a/tests/baselines/reference/iterableArrayPattern17.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern17.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(16,17): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar'.
-  Property 'x' is missing in type 'FooIterator'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error TS2737: Property 'x' is missing in type FooIterator' but present in type 'Bar'.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts (2 errors) ====
@@ -24,5 +23,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar'.
-!!! error TS2345:   Property 'x' is missing in type 'FooIterator'.
\ No newline at end of file
+!!! error TS2737: Property 'x' is missing in type FooIterator' but present in type 'Bar'.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern18.errors.txt b/tests/baselines/reference/iterableArrayPattern18.errors.txt
index a3f8b6f840fca..0fd8155c38acd 100644
--- a/tests/baselines/reference/iterableArrayPattern18.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern18.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar[]'.
-  Property 'length' is missing in type 'FooIterator'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts(17,5): error TS2736: Type 'FooIterator' is missing the following properties from type 'Bar[]': length, pop, push, concat, and 24 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts (1 errors) ====
@@ -21,5 +20,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts(17,5): error
     function fun([a, b]: Bar[]) { }
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar[]'.
-!!! error TS2345:   Property 'length' is missing in type 'FooIterator'.
\ No newline at end of file
+!!! error TS2736: Type 'FooIterator' is missing the following properties from type 'Bar[]': length, pop, push, concat, and 24 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern19.errors.txt b/tests/baselines/reference/iterableArrayPattern19.errors.txt
index f4a9fac0a066a..aa1fabc45f54d 100644
--- a/tests/baselines/reference/iterableArrayPattern19.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern19.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts(17,5): error TS2345: Argument of type 'FooArrayIterator' is not assignable to parameter of type 'Bar[][]'.
-  Property 'length' is missing in type 'FooArrayIterator'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts(17,5): error TS2736: Type 'FooArrayIterator' is missing the following properties from type 'Bar[][]': length, pop, push, concat, and 24 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts (1 errors) ====
@@ -21,5 +20,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts(17,5): error
     function fun([[a], b]: Bar[][]) { }
     fun(new FooArrayIterator);
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'FooArrayIterator' is not assignable to parameter of type 'Bar[][]'.
-!!! error TS2345:   Property 'length' is missing in type 'FooArrayIterator'.
\ No newline at end of file
+!!! error TS2736: Type 'FooArrayIterator' is missing the following properties from type 'Bar[][]': length, pop, push, concat, and 24 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern26.errors.txt b/tests/baselines/reference/iterableArrayPattern26.errors.txt
index a5eff0afb0df0..ec01e6ebc121a 100644
--- a/tests/baselines/reference/iterableArrayPattern26.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern26.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(1,33): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(2,21): error TS2345: Argument of type 'Map<string, number>' is not assignable to parameter of type '[string, number]'.
-  Property '0' is missing in type 'Map<string, number>'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(2,21): error TS2736: Type 'Map<string, number>' is missing the following properties from type '[string, number]': 0, 1, length, pop, and 22 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts (2 errors) ====
@@ -9,5 +8,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(2,21): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'Map<string, number>' is not assignable to parameter of type '[string, number]'.
-!!! error TS2345:   Property '0' is missing in type 'Map<string, number>'.
\ No newline at end of file
+!!! error TS2736: Type 'Map<string, number>' is missing the following properties from type '[string, number]': 0, 1, length, pop, and 22 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern7.errors.txt b/tests/baselines/reference/iterableArrayPattern7.errors.txt
index 972de74039fbb..6fa83f22d669b 100644
--- a/tests/baselines/reference/iterableArrayPattern7.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts(17,5): error TS2322: Type 'Foo' is not assignable to type 'string[]'.
-  Property 'length' is missing in type 'Foo'.
+  Type 'Foo' is missing the following properties from type 'string[]': length, pop, push, concat, and 25 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts (1 errors) ====
@@ -22,4 +22,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts(17,5): error
     [a, b] = new FooIterator;
         ~
 !!! error TS2322: Type 'Foo' is not assignable to type 'string[]'.
-!!! error TS2322:   Property 'length' is missing in type 'Foo'.
\ No newline at end of file
+!!! error TS2322:   Type 'Foo' is missing the following properties from type 'string[]': length, pop, push, concat, and 25 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
index 5f43bb4f5ae2e..71e5e4ca0d9a1 100644
--- a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
         Types of property 'next' are incompatible.
           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
             Type '{ value: symbol; }' is not assignable to type 'IteratorResult<symbol>'.
-              Property 'done' is missing in type '{ value: symbol; }'.
+              Property 'done' is missing in type { value: symbol; }' but present in type 'IteratorResult<symbol>'.
 
 
 ==== tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts (1 errors) ====
@@ -30,4 +30,4 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
 !!! error TS2322:             Type '{ value: symbol; }' is not assignable to type 'IteratorResult<symbol>'.
-!!! error TS2322:               Property 'done' is missing in type '{ value: symbol; }'.
\ No newline at end of file
+!!! error TS2322:               Property 'done' is missing in type { value: symbol; }' but present in type 'IteratorResult<symbol>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt b/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt
index 8e675ae14728d..a33393fc81825 100644
--- a/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt
+++ b/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/salsa/b.js(1,7): error TS2322: Type '{}' is not assignable to type 'typeof A'.
-  Property 'prototype' is missing in type '{}'.
+  Type '{}' is missing the following properties from type 'typeof A': prototype, d
 
 
 ==== tests/cases/conformance/salsa/a.d.ts (0 errors) ====
@@ -8,6 +8,6 @@ tests/cases/conformance/salsa/b.js(1,7): error TS2322: Type '{}' is not assignab
     const A = { };
           ~
 !!! error TS2322: Type '{}' is not assignable to type 'typeof A'.
-!!! error TS2322:   Property 'prototype' is missing in type '{}'.
+!!! error TS2322:   Type '{}' is missing the following properties from type 'typeof A': prototype, d
     A.d = { };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocFunctionType.errors.txt b/tests/baselines/reference/jsdocFunctionType.errors.txt
index 248448c0998a1..573f97171ce2b 100644
--- a/tests/baselines/reference/jsdocFunctionType.errors.txt
+++ b/tests/baselines/reference/jsdocFunctionType.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/jsdoc/functions.js(65,14): error TS2345: Argument of type 'typeof E' is not assignable to parameter of type 'new (arg1: number) => { length: number; }'.
-  Type 'E' is not assignable to type '{ length: number; }'.
-    Property 'length' is missing in type 'E'.
+  Property 'length' is missing in type E' but present in type '{ length: number; }'.
 
 
 ==== tests/cases/conformance/jsdoc/functions.js (1 errors) ====
@@ -71,6 +70,5 @@ tests/cases/conformance/jsdoc/functions.js(65,14): error TS2345: Argument of typ
     var y3 = id2(E);
                  ~
 !!! error TS2345: Argument of type 'typeof E' is not assignable to parameter of type 'new (arg1: number) => { length: number; }'.
-!!! error TS2345:   Type 'E' is not assignable to type '{ length: number; }'.
-!!! error TS2345:     Property 'length' is missing in type 'E'.
+!!! error TS2345:   Property 'length' is missing in type E' but present in type '{ length: number; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateTag3.errors.txt b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
index 19b8231158ddf..e77fe17dd5f55 100644
--- a/tests/baselines/reference/jsdocTemplateTag3.errors.txt
+++ b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/jsdoc/a.js(14,29): error TS2339: Property 'a' does not exist on type 'U'.
 tests/cases/conformance/jsdoc/a.js(14,35): error TS2339: Property 'b' does not exist on type 'U'.
-tests/cases/conformance/jsdoc/a.js(21,3): error TS2345: Argument of type '{ a: number; }' is not assignable to parameter of type '{ a: number; b: string; }'.
-  Property 'b' is missing in type '{ a: number; }'.
+tests/cases/conformance/jsdoc/a.js(21,3): error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
 tests/cases/conformance/jsdoc/a.js(24,15): error TS2304: Cannot find name 'NoLongerAllowed'.
 tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type parameter name was expected without curly braces.
 
@@ -33,8 +32,7 @@ tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type
     f({ a: 12, b: 'hi', c: null }, undefined, { c: false, d: 12, b: undefined }, 101, 'nope');
     f({ a: 12  }, undefined, undefined, 101, 'nope');
       ~~~~~~~~~~
-!!! error TS2345: Argument of type '{ a: number; }' is not assignable to parameter of type '{ a: number; b: string; }'.
-!!! error TS2345:   Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
     
     /**
      * @template {NoLongerAllowed}
diff --git a/tests/baselines/reference/jsdocTypeTagCast.errors.txt b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
index 061cffd0d26e4..e647ef4f0057d 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.errors.txt
+++ b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
@@ -1,12 +1,8 @@
 tests/cases/conformance/jsdoc/b.js(4,13): error TS2352: Conversion of type 'number' to type 'string' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-tests/cases/conformance/jsdoc/b.js(45,16): error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'p' is missing in type 'SomeOther'.
-tests/cases/conformance/jsdoc/b.js(49,19): error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'x' is missing in type 'SomeOther'.
-tests/cases/conformance/jsdoc/b.js(51,17): error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'q' is missing in type 'SomeDerived'.
-tests/cases/conformance/jsdoc/b.js(52,17): error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'q' is missing in type 'SomeBase'.
+tests/cases/conformance/jsdoc/b.js(45,16): error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
+tests/cases/conformance/jsdoc/b.js(49,19): error TS2735: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
+tests/cases/conformance/jsdoc/b.js(51,17): error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
+tests/cases/conformance/jsdoc/b.js(52,17): error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
 tests/cases/conformance/jsdoc/b.js(58,1): error TS2322: Type 'SomeFakeClass' is not assignable to type 'SomeBase'.
   Types of property 'p' are incompatible.
     Type 'string | number' is not assignable to type 'number'.
@@ -70,24 +66,20 @@ tests/cases/conformance/jsdoc/b.js(67,8): error TS2454: Variable 'numOrStr' is u
     someBase = /** @type {SomeBase} */(someBase);
     someBase = /** @type {SomeBase} */(someOther); // Error
                    ~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'p' is missing in type 'SomeOther'.
+!!! error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
     
     someDerived = /** @type {SomeDerived} */(someDerived);
     someDerived = /** @type {SomeDerived} */(someBase);
     someDerived = /** @type {SomeDerived} */(someOther); // Error
                       ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'x' is missing in type 'SomeOther'.
+!!! error TS2735: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
     
     someOther = /** @type {SomeOther} */(someDerived); // Error
                     ~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'q' is missing in type 'SomeDerived'.
+!!! error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
     someOther = /** @type {SomeOther} */(someBase); // Error
                     ~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'q' is missing in type 'SomeBase'.
+!!! error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
     someOther = /** @type {SomeOther} */(someOther);
     
     someFakeClass = someBase;
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index a59859875bddf..7ce3abc71357b 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -21,8 +21,7 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(59,9): error TS2403: Su
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(75,45): error TS2345: Argument of type '{ x: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
-  Property 'y' is missing in type '{ x: number; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(75,45): error TS2737: Property 'y' is missing in type { x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(77,59): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
   Object literal may only specify known properties, and 'z' does not exist in type 'Readonly<{ x: number; y: number; }>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(83,58): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Partial<{ x: number; y: number; }>'.
@@ -156,8 +155,7 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(152,17): error TS2339:
     function f20() {
         let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
                                                 ~~~~~~~~
-!!! error TS2345: Argument of type '{ x: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
-!!! error TS2345:   Property 'y' is missing in type '{ x: number; }'.
+!!! error TS2737: Property 'y' is missing in type { x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
         let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
         let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
                                                               ~~~~
diff --git a/tests/baselines/reference/mappedTypes6.errors.txt b/tests/baselines/reference/mappedTypes6.errors.txt
index 843a59eecb5fb..8287ba1e45eec 100644
--- a/tests/baselines/reference/mappedTypes6.errors.txt
+++ b/tests/baselines/reference/mappedTypes6.errors.txt
@@ -12,13 +12,13 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(56,5): error TS2322: Type '
 tests/cases/conformance/types/mapped/mappedTypes6.ts(57,5): error TS2322: Type '{}' is not assignable to type 'Required<T>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(58,5): error TS2322: Type '{}' is not assignable to type 'T'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(92,1): error TS2322: Type '{ a: number; }' is not assignable to type 'Foo'.
-  Property 'b' is missing in type '{ a: number; }'.
+  Property 'b' is missing in type { a: number; }' but present in type 'Foo'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(104,1): error TS2322: Type '{ a: number; }' is not assignable to type 'Required<Foo>'.
-  Property 'b' is missing in type '{ a: number; }'.
+  Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
 tests/cases/conformance/types/mapped/mappedTypes6.ts(105,1): error TS2322: Type '{ a: number; b: number; }' is not assignable to type 'Required<Foo>'.
-  Property 'c' is missing in type '{ a: number; b: number; }'.
+  Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
 tests/cases/conformance/types/mapped/mappedTypes6.ts(106,1): error TS2322: Type '{ a: number; b: number; c: number; }' is not assignable to type 'Required<Foo>'.
-  Property 'd' is missing in type '{ a: number; b: number; c: number; }'.
+  Property 'd' is missing in type { a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(116,4): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(119,4): error TS2540: Cannot assign to 'a' because it is a constant or a read-only property.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
@@ -144,7 +144,7 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     x1 = { a: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2322:   Property 'b' is missing in type { a: number; }' but present in type 'Foo'.
     x1 = { a: 1, b: 1 };
     x1 = { a: 1, b: 1, c: 1 };
     x1 = { a: 1, b: 1, c: 1, d: 1 };
@@ -159,15 +159,15 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     x2 = { a: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2322:   Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
     x2 = { a: 1, b: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; b: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Property 'c' is missing in type '{ a: number; b: number; }'.
+!!! error TS2322:   Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
     x2 = { a: 1, b: 1, c: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; b: number; c: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Property 'd' is missing in type '{ a: number; b: number; c: number; }'.
+!!! error TS2322:   Property 'd' is missing in type { a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
     x2 = { a: 1, b: 1, c: 1, d: 1 };
     
     type Bar = {
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
index eaf516146f4a2..fb6d7cfe587ba 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
@@ -3,7 +3,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(23,7): error TS2415: Class 'E' incorrectly extends base class 'C2'.
   Property 'w' is private in type 'C2' but not in type 'E'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(23,7): error TS2420: Class 'E' incorrectly implements interface 'A'.
-  Property 'x' is missing in type 'E'.
+  Property 'x' is missing in type E' but present in type 'A'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(30,11): error TS2341: Property 'x' is private and only accessible within class 'C'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(31,12): error TS2341: Property 'w' is private and only accessible within class 'C2'.
 
@@ -40,7 +40,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
 !!! error TS2415:   Property 'w' is private in type 'C2' but not in type 'E'.
           ~
 !!! error TS2420: Class 'E' incorrectly implements interface 'A'.
-!!! error TS2420:   Property 'x' is missing in type 'E'.
+!!! error TS2420:   Property 'x' is missing in type E' but present in type 'A'.
         w: number;
         y: string;
         z: string;
diff --git a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
index bb35b351c1b44..cdad774ca1faa 100644
--- a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
+++ b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts(13,17): error TS2345: Argument of type 'B<T>' is not assignable to parameter of type 'A<{}>'.
-  Property 'a' is missing in type 'B<T>'.
+tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts(13,17): error TS2737: Property 'a' is missing in type B<T>' but present in type 'A<{}>'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts (1 errors) ====
@@ -17,8 +16,7 @@ tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeF
         if (x instanceof B) {
             acceptA(x);
                     ~
-!!! error TS2345: Argument of type 'B<T>' is not assignable to parameter of type 'A<{}>'.
-!!! error TS2345:   Property 'a' is missing in type 'B<T>'.
+!!! error TS2737: Property 'a' is missing in type B<T>' but present in type 'A<{}>'.
         }
     
         if (x instanceof A) {
diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt b/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
index 3f30b649c9687..906a2351f89ed 100644
--- a/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
+++ b/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/noImplicitAnyInCastExpression.ts(15,2): error TS2352: Conversion of type '{ c: null; }' to type 'IFoo' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'a' is missing in type '{ c: null; }'.
+tests/cases/compiler/noImplicitAnyInCastExpression.ts(15,2): error TS2735: Type '{ c: null; }' is missing the following properties from type 'IFoo': a, b
 
 
 ==== tests/cases/compiler/noImplicitAnyInCastExpression.ts (1 errors) ====
@@ -19,5 +18,4 @@ tests/cases/compiler/noImplicitAnyInCastExpression.ts(15,2): error TS2352: Conve
     // Neither types is assignable to each other
     (<IFoo>{ c: null });
      ~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type '{ c: null; }' to type 'IFoo' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'a' is missing in type '{ c: null; }'.
\ No newline at end of file
+!!! error TS2735: Type '{ c: null; }' is missing the following properties from type 'IFoo': a, b
\ No newline at end of file
diff --git a/tests/baselines/reference/nonIterableRestElement3.errors.txt b/tests/baselines/reference/nonIterableRestElement3.errors.txt
index 2c44aba661e14..6a5df2251b68f 100644
--- a/tests/baselines/reference/nonIterableRestElement3.errors.txt
+++ b/tests/baselines/reference/nonIterableRestElement3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error TS2322: Type '(string | number)[]' is not assignable to type '{ bogus: number; }'.
-  Property 'bogus' is missing in type '(string | number)[]'.
+  Property 'bogus' is missing in type (string | number)[]' but present in type '{ bogus: number; }'.
 
 
 ==== tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts (1 errors) ====
@@ -7,4 +7,4 @@ tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error
     [...c] = ["", 0];
         ~
 !!! error TS2322: Type '(string | number)[]' is not assignable to type '{ bogus: number; }'.
-!!! error TS2322:   Property 'bogus' is missing in type '(string | number)[]'.
\ No newline at end of file
+!!! error TS2322:   Property 'bogus' is missing in type (string | number)[]' but present in type '{ bogus: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
index f8c4450f3aaa6..e7609be7363e1 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-  Property 'foo' is missing in type '{}'.
+  Property 'foo' is missing in type {}' but present in type '{ foo: string; }'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'number' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(14,1): error TS2322: Type 'true' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'string' is not assignable to type 'object'.
@@ -16,7 +16,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): err
     y = a; // expect error
     ~
 !!! error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-!!! error TS2322:   Property 'foo' is missing in type '{}'.
+!!! error TS2322:   Property 'foo' is missing in type {}' but present in type '{ foo: string; }'.
     a = x;
     a = y;
     
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
index fb2cbdaf649e6..ad5f630676b87 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
@@ -2,10 +2,8 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(8,6): error TS2
   Object literal may only specify known properties, and 'hello' does not exist in type 'I'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(10,17): error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I'.
   Object literal may only specify known properties, and 'what' does not exist in type 'I'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(11,4): error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
-  Property 'value' is missing in type '{ toString: (s: string) => string; }'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(12,4): error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
-  Property 'value' is missing in type '{ toString: (s: string) => string; }'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(11,4): error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(12,4): error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error TS2339: Property 'uhhh' does not exist on type 'string'.
 
 
@@ -28,12 +26,10 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error T
 !!! error TS2345:   Object literal may only specify known properties, and 'what' does not exist in type 'I'.
     f2({ toString: (s) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
-!!! error TS2345:   Property 'value' is missing in type '{ toString: (s: string) => string; }'.
+!!! error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
     f2({ toString: (s: string) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
-!!! error TS2345:   Property 'value' is missing in type '{ toString: (s: string) => string; }'.
+!!! error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
     f2({ value: '', toString: (s) => s.uhhh }) // error
                                        ~~~~
 !!! error TS2339: Property 'uhhh' does not exist on type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
index 3c3d292216bf4..92ee58e53cee7 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(8,6): error TS2345: Argument of type '{ hello: number; }' is not assignable to parameter of type 'I2'.
   Object literal may only specify known properties, and 'hello' does not exist in type 'I2'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(9,4): error TS2345: Argument of type '{ value: string; }' is not assignable to parameter of type 'I2'.
-  Property 'doStuff' is missing in type '{ value: string; }'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(9,4): error TS2737: Property 'doStuff' is missing in type { value: string; }' but present in type 'I2'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(10,17): error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I2'.
   Object literal may only specify known properties, and 'what' does not exist in type 'I2'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(11,6): error TS2322: Type '(s: any) => any' is not assignable to type '() => string'.
@@ -23,8 +22,7 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(13,17): error
 !!! error TS2345:   Object literal may only specify known properties, and 'hello' does not exist in type 'I2'.
     f2({ value: '' })
        ~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '{ value: string; }' is not assignable to parameter of type 'I2'.
-!!! error TS2345:   Property 'doStuff' is missing in type '{ value: string; }'.
+!!! error TS2737: Property 'doStuff' is missing in type { value: string; }' but present in type 'I2'.
     f2({ value: '', what: 1 }) 
                     ~~~~~~~
 !!! error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I2'.
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
index 636f098158b83..44025b85a1e9f 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/objectLiteralIndexerErrors.ts(13,54): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'y' is missing in type 'A'.
+  Property 'y' is missing in type A' but present in type 'B'.
 tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A' is not assignable to type 'B'.
 
 
@@ -19,7 +19,7 @@ tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A
     var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
                                                          ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'y' is missing in type 'A'.
+!!! error TS2322:   Property 'y' is missing in type A' but present in type 'B'.
 !!! related TS6501 tests/cases/compiler/objectLiteralIndexerErrors.ts:13:26: The expected type comes from this index signature.
     o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
                  ~
diff --git a/tests/baselines/reference/objectLiteralNormalization.errors.txt b/tests/baselines/reference/objectLiteralNormalization.errors.txt
index 2a09dd3b4df50..2305a2f0da204 100644
--- a/tests/baselines/reference/objectLiteralNormalization.errors.txt
+++ b/tests/baselines/reference/objectLiteralNormalization.errors.txt
@@ -1,17 +1,17 @@
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(7,14): error TS2322: Type 'number' is not assignable to type 'string | undefined'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(8,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
   Type '{ b: string; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-    Property 'a' is missing in type '{ b: string; }'.
+    Type '{ b: string; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, c
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(9,1): error TS2322: Type '{ c: true; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
   Type '{ c: true; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-    Property 'a' is missing in type '{ c: true; }'.
+    Type '{ c: true; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, b
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(17,1): error TS2322: Type '{ a: string; b: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
   Type '{ a: string; b: number; }' is not assignable to type '{ a?: undefined; b?: undefined; }'.
     Types of property 'a' are incompatible.
       Type 'string' is not assignable to type 'undefined'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(18,1): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
   Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
-    Property 'b' is missing in type '{ a: number; }'.
+    Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: number; }'.
 
 
 ==== tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts (5 errors) ====
@@ -29,12 +29,12 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
     ~~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
 !!! error TS2322:   Type '{ b: string; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-!!! error TS2322:     Property 'a' is missing in type '{ b: string; }'.
+!!! error TS2322:     Type '{ b: string; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, c
     a1 = { c: true };  // Error
     ~~
 !!! error TS2322: Type '{ c: true; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
 !!! error TS2322:   Type '{ c: true; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-!!! error TS2322:     Property 'a' is missing in type '{ c: true; }'.
+!!! error TS2322:     Type '{ c: true; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, b
     
     let a2 = [{ a: 1, b: 2 }, { a: "abc" }, {}][0];
     a2.a;  // string | number | undefined
@@ -52,7 +52,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
 !!! error TS2322:   Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:     Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2322:     Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: number; }'.
     
     // Object literals containing spreads are not normalized
     declare let b1: { a: string, b: string } | { b: string, c: string };
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
index 00ac59319eccc..3f23b89e950c6 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts(7,5): error TS2345: Argument of type '{ name: string; id: number; }' is not assignable to parameter of type '{ a: string; id: number; }'.
-  Property 'a' is missing in type '{ name: string; id: number; }'.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts(7,5): error TS2737: Property 'a' is missing in type { name: string; id: number; }' but present in type '{ a: string; id: number; }'.
 
 
 ==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts (1 errors) ====
@@ -11,6 +10,5 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
     function foo(p: { a: string; id: number }) { }
     foo(person);  // error
         ~~~~~~
-!!! error TS2345: Argument of type '{ name: string; id: number; }' is not assignable to parameter of type '{ a: string; id: number; }'.
-!!! error TS2345:   Property 'a' is missing in type '{ name: string; id: number; }'.
+!!! error TS2737: Property 'a' is missing in type { name: string; id: number; }' but present in type '{ a: string; id: number; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 5c5e94c06f6c2..a2304c570a47e 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -2,9 +2,9 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(13,21): error TS233
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(16,5): error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
   Property 'sn' is optional in type '{ sn?: string | number; }' but required in type '{ sn: string | number; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(23,1): error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 'b' is missing in type '{ s: string; }'.
+  Property 'b' is missing in type { s: string; }' but present in type '{ s: string; b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 's' is missing in type '{ b: boolean; }'.
+  Property 's' is missing in type { b: boolean; }' but present in type '{ s: string; b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,19): error TS2698: Spread types may only be created from object types.
@@ -49,12 +49,12 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,11): error TS233
     spread = { s: "foo" };  // error, missing 'b'
     ~~~~~~
 !!! error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ s: string; }'.
+!!! error TS2322:   Property 'b' is missing in type { s: string; }' but present in type '{ s: string; b: boolean; }'.
     let b = { b: false };
     spread = b; // error, missing 's'
     ~~~~~~
 !!! error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 's' is missing in type '{ b: boolean; }'.
+!!! error TS2322:   Property 's' is missing in type { b: boolean; }' but present in type '{ s: string; b: boolean; }'.
     
     // literal repeats are not allowed, but spread repeats are fine
     let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
index 983548016e8b9..c55e5f4d097f0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2352: Conversion of type 'C3<T2>' to type 'C4' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'y' is missing in type 'C3<T2>'.
+tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2737: Property 'y' is missing in type C3<T2>' but present in type 'C4'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts (1 errors) ====
@@ -29,5 +28,4 @@ tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectType
     var c3: C3<T2>;
     <C4>c3; // Should fail (private x originates in the same declaration, but different types)
     ~~~~~~
-!!! error TS2352: Conversion of type 'C3<T2>' to type 'C4' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'y' is missing in type 'C3<T2>'.
\ No newline at end of file
+!!! error TS2737: Property 'y' is missing in type C3<T2>' but present in type 'C4'.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalPropertiesInClasses.errors.txt b/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
index 7e27dea4df96a..1acc3a65fe35c 100644
--- a/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/optionalPropertiesInClasses.ts(10,7): error TS2420: Class 'C2' incorrectly implements interface 'ifoo'.
-  Property 'y' is missing in type 'C2'.
+  Property 'y' is missing in type C2' but present in type 'ifoo'.
 
 
 ==== tests/cases/compiler/optionalPropertiesInClasses.ts (1 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/optionalPropertiesInClasses.ts(10,7): error TS2420: Class '
     class C2 implements ifoo { // ERROR - still need 'y'
           ~~
 !!! error TS2420: Class 'C2' incorrectly implements interface 'ifoo'.
-!!! error TS2420:   Property 'y' is missing in type 'C2'.
+!!! error TS2420:   Property 'y' is missing in type C2' but present in type 'ifoo'.
     	public x:number;
     }
     
diff --git a/tests/baselines/reference/optionalPropertiesTest.errors.txt b/tests/baselines/reference/optionalPropertiesTest.errors.txt
index a4b721e92ef66..6ca80e0ec6623 100644
--- a/tests/baselines/reference/optionalPropertiesTest.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesTest.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/optionalPropertiesTest.ts(14,1): error TS2322: Type '{ name: string; }' is not assignable to type 'IFoo'.
-  Property 'id' is missing in type '{ name: string; }'.
+  Property 'id' is missing in type { name: string; }' but present in type 'IFoo'.
 tests/cases/compiler/optionalPropertiesTest.ts(25,5): error TS2322: Type '{}' is not assignable to type 'i1'.
-  Property 'M' is missing in type '{}'.
+  Property 'M' is missing in type {}' but present in type 'i1'.
 tests/cases/compiler/optionalPropertiesTest.ts(26,5): error TS2322: Type '{}' is not assignable to type 'i3'.
-  Property 'M' is missing in type '{}'.
+  Property 'M' is missing in type {}' but present in type 'i3'.
 tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is not assignable to type 'i1'.
   Property 'M' is optional in type 'i2' but required in type 'i1'.
 
@@ -25,7 +25,7 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     foo = { name: "test" };            // Error, id missing
     ~~~
 !!! error TS2322: Type '{ name: string; }' is not assignable to type 'IFoo'.
-!!! error TS2322:   Property 'id' is missing in type '{ name: string; }'.
+!!! error TS2322:   Property 'id' is missing in type { name: string; }' but present in type 'IFoo'.
     foo = {id: 1234, print:()=>{}}	   // Ok
     
     var s = foo.name || "default";
@@ -39,11 +39,11 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     var test1: i1 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i1'.
-!!! error TS2322:   Property 'M' is missing in type '{}'.
+!!! error TS2322:   Property 'M' is missing in type {}' but present in type 'i1'.
     var test2: i3 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i3'.
-!!! error TS2322:   Property 'M' is missing in type '{}'.
+!!! error TS2322:   Property 'M' is missing in type {}' but present in type 'i3'.
     var test3: i2 = {};
     var test4: i4 = {};
     var test5: i1 = { M: function () { } };
diff --git a/tests/baselines/reference/overloadingOnConstants1.errors.txt b/tests/baselines/reference/overloadingOnConstants1.errors.txt
index f134a1465000d..4cc357265b9a4 100644
--- a/tests/baselines/reference/overloadingOnConstants1.errors.txt
+++ b/tests/baselines/reference/overloadingOnConstants1.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/overloadingOnConstants1.ts(22,5): error TS2322: Type 'Base' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type 'Base'.
+  Property 'bar' is missing in type Base' but present in type 'Derived1'.
 tests/cases/compiler/overloadingOnConstants1.ts(23,5): error TS2322: Type 'Derived1' is not assignable to type 'Derived3'.
-  Property 'biz' is missing in type 'Derived1'.
+  Property 'biz' is missing in type Derived1' but present in type 'Derived3'.
 tests/cases/compiler/overloadingOnConstants1.ts(24,5): error TS2322: Type 'Derived2' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type 'Derived2'.
+  Property 'bar' is missing in type Derived2' but present in type 'Derived1'.
 tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2322: Type 'Derived3' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type 'Derived3'.
+  Property 'bar' is missing in type Derived3' but present in type 'Derived1'.
 
 
 ==== tests/cases/compiler/overloadingOnConstants1.ts (4 errors) ====
@@ -33,16 +33,16 @@ tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2322: Type 'Deriv
     var htmlElement2: Derived1 = d2.createElement("yo")
         ~~~~~~~~~~~~
 !!! error TS2322: Type 'Base' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type 'Base'.
+!!! error TS2322:   Property 'bar' is missing in type Base' but present in type 'Derived1'.
     var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
         ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Derived1' is not assignable to type 'Derived3'.
-!!! error TS2322:   Property 'biz' is missing in type 'Derived1'.
+!!! error TS2322:   Property 'biz' is missing in type Derived1' but present in type 'Derived3'.
     var htmlDivElement2: Derived1 = d2.createElement("div");
         ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Derived2' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type 'Derived2'.
+!!! error TS2322:   Property 'bar' is missing in type Derived2' but present in type 'Derived1'.
     var htmlSpanElement2: Derived1 = d2.createElement("span");
         ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Derived3' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type 'Derived3'.
\ No newline at end of file
+!!! error TS2322:   Property 'bar' is missing in type Derived3' but present in type 'Derived1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
index 3c06fd4327536..cae5718bb2dbf 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
@@ -1,12 +1,10 @@
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,5): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,37): error TS2345: Argument of type 'D' is not assignable to parameter of type 'A'.
-  Property 'x' is missing in type 'D'.
+tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,37): error TS2737: Property 'x' is missing in type D' but present in type 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,5): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,38): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(18,27): error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'B' is not assignable to type 'D'.
-      Property 'q' is missing in type 'B'.
+    Property 'q' is missing in type B' but present in type 'D'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 
 
@@ -28,8 +26,7 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
         ~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
                                         ~
-!!! error TS2345: Argument of type 'D' is not assignable to parameter of type 'A'.
-!!! error TS2345:   Property 'x' is missing in type 'D'.
+!!! error TS2737: Property 'x' is missing in type D' but present in type 'A'.
     
     var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fails, so first overload is picked.
         ~~~~~~~
@@ -41,8 +38,7 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
                               ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'B' is not assignable to type 'D'.
-!!! error TS2345:       Property 'q' is missing in type 'B'.
+!!! error TS2345:     Property 'q' is missing in type B' but present in type 'D'.
         var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
                  ~~~~~~~~
 !!! error TS2344: Type 'D' does not satisfy the constraint 'A'.
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
index aa247f0bd961d..be54e50bb65ab 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -1,8 +1,8 @@
 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 '{}'.
+  Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(7,17): error TS2304: Cannot find name 'blah'.
 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; }'.
+  Property 'b' is missing in type { a: any; }' but present in type '{ a: number; b: number; }'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'.
 
 
@@ -15,7 +15,7 @@ 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 TS2322: Type '{}' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:   Property 'a' is missing in type '{}'.
+!!! error TS2322:   Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
 !!! 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)
                     ~~~~
@@ -23,7 +23,7 @@ tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cann
     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 TS2322: Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: any; }'.
+!!! error TS2322:   Property 'b' is missing in type { a: any; }' but present in type '{ a: number; b: number; }'.
 !!! 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/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index 0ff2a36f7b35e..425459aca04a9 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -46,8 +46,7 @@ tests/cases/compiler/promisePermutations.ts(137,33): error TS2345: Argument of t
   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 tests/cases/compiler/promisePermutations.ts(144,35): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => IPromise<number>'.
 tests/cases/compiler/promisePermutations.ts(152,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-  Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
-    Property 'catch' is missing in type 'IPromise<string>'.
+  Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
 tests/cases/compiler/promisePermutations.ts(156,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
     Type 'number' is not assignable to type 'string'.
@@ -295,8 +294,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
     var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-!!! error TS2345:   Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
-!!! error TS2345:     Property 'catch' is missing in type 'IPromise<string>'.
+!!! error TS2345:   Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index b9fb0dc93faa3..039d53d3e4be2 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -46,8 +46,7 @@ tests/cases/compiler/promisePermutations2.ts(136,33): error TS2345: Argument of
   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 tests/cases/compiler/promisePermutations2.ts(143,35): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => IPromise<number>'.
 tests/cases/compiler/promisePermutations2.ts(151,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-  Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
-    Property 'catch' is missing in type 'IPromise<string>'.
+  Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
 tests/cases/compiler/promisePermutations2.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
     Type 'number' is not assignable to type 'string'.
@@ -294,8 +293,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
     var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-!!! error TS2345:   Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
-!!! error TS2345:     Property 'catch' is missing in type 'IPromise<string>'.
+!!! error TS2345:   Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index e995c4f1d3870..cc6e8c2a35290 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -49,8 +49,7 @@ tests/cases/compiler/promisePermutations3.ts(136,33): error TS2345: Argument of
   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 tests/cases/compiler/promisePermutations3.ts(143,35): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => IPromise<number>'.
 tests/cases/compiler/promisePermutations3.ts(151,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-  Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
-    Property 'catch' is missing in type 'IPromise<string>'.
+  Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
 tests/cases/compiler/promisePermutations3.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
     Type 'number' is not assignable to type 'string'.
@@ -67,8 +66,7 @@ tests/cases/compiler/promisePermutations3.ts(159,21): error TS2345: Argument of
           Types of parameters 'value' and 'value' are incompatible.
             Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<{}>'.
-  Type 'IPromise<any>' is not assignable to type 'Promise<{}>'.
-    Property 'catch' is missing in type 'IPromise<any>'.
+  Property 'catch' is missing in type IPromise<any>' but present in type 'Promise<{}>'.
 
 
 ==== tests/cases/compiler/promisePermutations3.ts (35 errors) ====
@@ -304,8 +302,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
     var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-!!! error TS2345:   Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
-!!! error TS2345:     Property 'catch' is missing in type 'IPromise<string>'.
+!!! error TS2345:   Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
@@ -341,6 +338,5 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
     var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok
                         ~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<{}>'.
-!!! error TS2345:   Type 'IPromise<any>' is not assignable to type 'Promise<{}>'.
-!!! error TS2345:     Property 'catch' is missing in type 'IPromise<any>'.
+!!! error TS2345:   Property 'catch' is missing in type IPromise<any>' but present in type 'Promise<{}>'.
     var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
\ No newline at end of file
diff --git a/tests/baselines/reference/promisesWithConstraints.errors.txt b/tests/baselines/reference/promisesWithConstraints.errors.txt
index d2c459da28486..2f30c7ad5d34c 100644
--- a/tests/baselines/reference/promisesWithConstraints.errors.txt
+++ b/tests/baselines/reference/promisesWithConstraints.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/promisesWithConstraints.ts(15,1): error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
   Type 'Foo' is not assignable to type 'Bar'.
-    Property 'y' is missing in type 'Foo'.
+    Property 'y' is missing in type Foo' but present in type 'Bar'.
 tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CPromise<Foo>' is not assignable to type 'CPromise<Bar>'.
   Type 'Foo' is not assignable to type 'Bar'.
 
@@ -24,7 +24,7 @@ tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CProm
     ~
 !!! error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
 !!! error TS2322:   Type 'Foo' is not assignable to type 'Bar'.
-!!! error TS2322:     Property 'y' is missing in type 'Foo'.
+!!! error TS2322:     Property 'y' is missing in type Foo' but present in type 'Bar'.
     
     var a2: CPromise<Foo>;
     var b2: CPromise<Bar>;
diff --git a/tests/baselines/reference/qualify.errors.txt b/tests/baselines/reference/qualify.errors.txt
index 6c12823c964da..4dbb577f1a37f 100644
--- a/tests/baselines/reference/qualify.errors.txt
+++ b/tests/baselines/reference/qualify.errors.txt
@@ -1,17 +1,17 @@
 tests/cases/compiler/qualify.ts(21,13): error TS2322: Type '3' is not assignable to type 'I'.
 tests/cases/compiler/qualify.ts(30,13): error TS2322: Type '3' is not assignable to type 'I2'.
 tests/cases/compiler/qualify.ts(45,13): error TS2322: Type 'I4' is not assignable to type 'I3'.
-  Property 'zeep' is missing in type 'I4'.
+  Property 'zeep' is missing in type I4' but present in type 'I3'.
 tests/cases/compiler/qualify.ts(46,13): error TS2322: Type 'I4' is not assignable to type 'I3[]'.
-  Property 'length' is missing in type 'I4'.
+  Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/qualify.ts(47,13): error TS2322: Type 'I4' is not assignable to type '() => I3'.
   Type 'I4' provides no match for the signature '(): I3'.
 tests/cases/compiler/qualify.ts(48,13): error TS2322: Type 'I4' is not assignable to type '(k: I3) => void'.
   Type 'I4' provides no match for the signature '(k: I3): void'.
 tests/cases/compiler/qualify.ts(49,13): error TS2322: Type 'I4' is not assignable to type '{ k: I3; }'.
-  Property 'k' is missing in type 'I4'.
+  Property 'k' is missing in type I4' but present in type '{ k: I3; }'.
 tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable to type 'T.I'.
-  Property 'p' is missing in type 'I'.
+  Property 'p' is missing in type I' but present in type 'I'.
 
 
 ==== tests/cases/compiler/qualify.ts (8 errors) ====
@@ -66,11 +66,11 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
             var v2:K1.I3=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type 'I3'.
-!!! error TS2322:   Property 'zeep' is missing in type 'I4'.
+!!! error TS2322:   Property 'zeep' is missing in type I4' but present in type 'I3'.
             var v3:K1.I3[]=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type 'I3[]'.
-!!! error TS2322:   Property 'length' is missing in type 'I4'.
+!!! error TS2322:   Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
             var v4:()=>K1.I3=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type '() => I3'.
@@ -82,7 +82,7 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
             var v6:{k:K1.I3;}=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type '{ k: I3; }'.
-!!! error TS2322:   Property 'k' is missing in type 'I4'.
+!!! error TS2322:   Property 'k' is missing in type I4' but present in type '{ k: I3; }'.
         }
     }
     
@@ -94,6 +94,6 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
     var x:T.I=y;
         ~
 !!! error TS2322: Type 'I' is not assignable to type 'T.I'.
-!!! error TS2322:   Property 'p' is missing in type 'I'.
+!!! error TS2322:   Property 'p' is missing in type I' but present in type 'I'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
index 4a1a6f1782c6f..095ffa331c7a9 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/compiler/recursiveClassReferenceTest.ts(16,19): error TS2304: Cannot find name 'Element'.
 tests/cases/compiler/recursiveClassReferenceTest.ts(56,11): error TS2663: Cannot find name 'domNode'. Did you mean the instance member 'this.domNode'?
 tests/cases/compiler/recursiveClassReferenceTest.ts(88,36): error TS2663: Cannot find name 'mode'. Did you mean the instance member 'this.mode'?
-tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' is not assignable to parameter of type 'IMode'.
-  Property 'getInitialState' is missing in type 'Window'.
+tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2737: Property 'getInitialState' is missing in type Window' but present in type 'IMode'.
 
 
 ==== tests/cases/compiler/recursiveClassReferenceTest.ts (4 errors) ====
@@ -108,8 +107,7 @@ tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2345: Argume
     		public getInitialState(): IState {
     			return new State(self);
     			                 ~~~~
-!!! error TS2345: Argument of type 'Window' is not assignable to parameter of type 'IMode'.
-!!! error TS2345:   Property 'getInitialState' is missing in type 'Window'.
+!!! error TS2737: Property 'getInitialState' is missing in type Window' but present in type 'IMode'.
     		}
     
     
diff --git a/tests/baselines/reference/recursiveInheritance3.errors.txt b/tests/baselines/reference/recursiveInheritance3.errors.txt
index 6ec3935ece4e9..8357ff20bdfb6 100644
--- a/tests/baselines/reference/recursiveInheritance3.errors.txt
+++ b/tests/baselines/reference/recursiveInheritance3.errors.txt
@@ -1,12 +1,12 @@
 tests/cases/compiler/recursiveInheritance3.ts(1,7): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property 'other' is missing in type 'C'.
+  Property 'other' is missing in type C' but present in type 'I'.
 
 
 ==== tests/cases/compiler/recursiveInheritance3.ts (1 errors) ====
     class C implements I {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'other' is missing in type 'C'.
+!!! error TS2420:   Property 'other' is missing in type C' but present in type 'I'.
         public foo(x: any) { return x; }
         private x = 1;
     }
diff --git a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
index 84762c2cec6e8..16ebbef12996a 100644
--- a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1): error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
   Type 'LinkedList<Entity>' is not assignable to type 'Product'.
-    Property 'price' is missing in type 'LinkedList<Entity>'.
+    Property 'price' is missing in type LinkedList<Entity>' but present in type 'Product'.
 
 
 ==== tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts (1 errors) ====
@@ -26,5 +26,5 @@ tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1):
     ~~~~~~~~~~~
 !!! error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
 !!! error TS2322:   Type 'LinkedList<Entity>' is not assignable to type 'Product'.
-!!! error TS2322:     Property 'price' is missing in type 'LinkedList<Entity>'.
+!!! error TS2322:     Property 'price' is missing in type LinkedList<Entity>' but present in type 'Product'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
index dcc976a1b5bac..fcf9a7f04bdd0 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
@@ -1,9 +1,9 @@
 /user.js(2,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
 /user.js(5,7): error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
-  Property 'b' is missing in type '{ "a": number; }'.
+  Property 'b' is missing in type { "a": number; }' but present in type '{ b: number; }'.
 /user.js(9,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
 /user.js(12,7): error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
-  Property 'b' is missing in type '{ a: number; }'.
+  Property 'b' is missing in type { a: number; }' but present in type '{ b: number; }'.
 
 
 ==== /user.js (4 errors) ====
@@ -16,7 +16,7 @@
     const json1 = require("./json.json"); // No error (bad)
           ~~~~~
 !!! error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ "a": number; }'.
+!!! error TS2322:   Property 'b' is missing in type { "a": number; }' but present in type '{ b: number; }'.
     json1.b; // No error (OK since that's the type annotation)
     
     const js0 = require("./js.js");
@@ -28,7 +28,7 @@
     const js1 = require("./js.js"); // Error (good)
           ~~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2322:   Property 'b' is missing in type { a: number; }' but present in type '{ b: number; }'.
     js1.b;
 ==== /json.json (0 errors) ====
     { "a": 0 }
diff --git a/tests/baselines/reference/restTupleElements1.errors.txt b/tests/baselines/reference/restTupleElements1.errors.txt
index dbabfbe640e24..13d1d5137f093 100644
--- a/tests/baselines/reference/restTupleElements1.errors.txt
+++ b/tests/baselines/reference/restTupleElements1.errors.txt
@@ -3,12 +3,9 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(8,13): error TS1256: A
 tests/cases/conformance/types/tuple/restTupleElements1.ts(9,13): error TS2574: A rest element type must be an array type.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(10,13): error TS2574: A rest element type must be an array type.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(10,16): error TS8020: JSDoc types can only be used inside documentation comments.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(23,31): error TS2344: Type 'number[]' does not satisfy the constraint '[number, ...number[]]'.
-  Property '0' is missing in type 'number[]'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(24,31): error TS2344: Type '[]' does not satisfy the constraint '[number, ...number[]]'.
-  Property '0' is missing in type '[]'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(29,18): error TS2344: Type 'number[]' does not satisfy the constraint '[number]'.
-  Property '0' is missing in type 'number[]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(23,31): error TS2737: Property '0' is missing in type number[]' but present in type '[number, ...number[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(24,31): error TS2737: Property '0' is missing in type []' but present in type '[number, ...number[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(29,18): error TS2737: Property '0' is missing in type number[]' but present in type '[number]'.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(30,18): error TS2344: Type '[number, ...number[]]' does not satisfy the constraint '[number]'.
   Types of property 'length' are incompatible.
     Type 'number' is not assignable to type '1'.
@@ -22,8 +19,7 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(34,31): error TS2344:
 tests/cases/conformance/types/tuple/restTupleElements1.ts(35,31): error TS2344: Type '[number, number, number, string]' does not satisfy the constraint '[number, ...number[]]'.
   Property '3' is incompatible with rest element type.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2345: Argument of type '[]' is not assignable to parameter of type '[{}, ...{}[]]'.
-  Property '0' is missing in type '[]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2737: Property '0' is missing in type []' but present in type '[{}, ...{}[]]'.
 
 
 ==== tests/cases/conformance/types/tuple/restTupleElements1.ts (14 errors) ====
@@ -61,20 +57,17 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2345: A
     
     assign<[number, ...number[]], number[]>();  // Error
                                   ~~~~~~~~
-!!! error TS2344: Type 'number[]' does not satisfy the constraint '[number, ...number[]]'.
-!!! error TS2344:   Property '0' is missing in type 'number[]'.
+!!! error TS2737: Property '0' is missing in type number[]' but present in type '[number, ...number[]]'.
     assign<[number, ...number[]], []>();  // Error
                                   ~~
-!!! error TS2344: Type '[]' does not satisfy the constraint '[number, ...number[]]'.
-!!! error TS2344:   Property '0' is missing in type '[]'.
+!!! error TS2737: Property '0' is missing in type []' but present in type '[number, ...number[]]'.
     assign<[number, ...number[]], [number]>();
     assign<[number, ...number[]], [number, number]>();
     assign<[number, ...number[]], [number, number, ...number[]]>();
     
     assign<[number], [...number[]]>();  // Error
                      ~~~~~~~~~~~~~
-!!! error TS2344: Type 'number[]' does not satisfy the constraint '[number]'.
-!!! error TS2344:   Property '0' is missing in type 'number[]'.
+!!! error TS2737: Property '0' is missing in type number[]' but present in type '[number]'.
     assign<[number], [number, ...number[]]>();  // Error
                      ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2344: Type '[number, ...number[]]' does not satisfy the constraint '[number]'.
@@ -124,8 +117,7 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2345: A
     
     f0([]);  // Error
        ~~
-!!! error TS2345: Argument of type '[]' is not assignable to parameter of type '[{}, ...{}[]]'.
-!!! error TS2345:   Property '0' is missing in type '[]'.
+!!! error TS2737: Property '0' is missing in type []' but present in type '[{}, ...{}[]]'.
     f0([1]);
     f0([1, 2, 3]);
     f0([1, "hello", true]);
diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt b/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt
index 7495095d07462..2dd3e2884fd1b 100644
--- a/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt
+++ b/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/types/rest/restTuplesFromContextualTypes.ts(56,7): error TS2345: Argument of type '(a: number, b: any, ...x: any[]) => void' is not assignable to parameter of type '(x: number, ...args: T) => void'.
   Types of parameters 'b' and 'args' are incompatible.
     Type 'T' is not assignable to type '[any, ...any[]]'.
-      Type 'any[]' is not assignable to type '[any, ...any[]]'.
-        Property '0' is missing in type 'any[]'.
+      Property '0' is missing in type any[]' but present in type '[any, ...any[]]'.
 
 
 ==== tests/cases/conformance/types/rest/restTuplesFromContextualTypes.ts (1 errors) ====
@@ -66,8 +65,7 @@ tests/cases/conformance/types/rest/restTuplesFromContextualTypes.ts(56,7): error
 !!! error TS2345: Argument of type '(a: number, b: any, ...x: any[]) => void' is not assignable to parameter of type '(x: number, ...args: T) => void'.
 !!! error TS2345:   Types of parameters 'b' and 'args' are incompatible.
 !!! error TS2345:     Type 'T' is not assignable to type '[any, ...any[]]'.
-!!! error TS2345:       Type 'any[]' is not assignable to type '[any, ...any[]]'.
-!!! error TS2345:         Property '0' is missing in type 'any[]'.
+!!! error TS2345:       Property '0' is missing in type any[]' but present in type '[any, ...any[]]'.
     }
     
     // Repro from #25288
diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
index 61afc0c2a1a1b..a3e9faebeb541 100644
--- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
+++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(12,1): error TS2322: Type 'C' is not assignable to type 'A'.
-  Property 'prop' is missing in type 'C'.
+  Property 'prop' is missing in type C' but present in type 'A'.
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(13,5): error TS2322: Type 'typeof B' is not assignable to type 'A'.
-  Property 'prop' is missing in type 'typeof B'.
+  Property 'prop' is missing in type typeof B' but present in type 'A'.
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(16,5): error TS2322: Type 'C' is not assignable to type 'B'.
-  Property 'prop' is missing in type 'C'.
+  Property 'prop' is missing in type C' but present in type 'B'.
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(17,5): error TS2322: Type 'typeof B' is not assignable to type 'B'.
-  Property 'prop' is missing in type 'typeof B'.
+  Property 'prop' is missing in type typeof B' but present in type 'B'.
 
 
 ==== tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts (4 errors) ====
@@ -23,22 +23,22 @@ tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.
     a = new C(); // error prop is missing
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'A'.
-!!! error TS2322:   Property 'prop' is missing in type 'C'.
+!!! error TS2322:   Property 'prop' is missing in type C' but present in type 'A'.
     a = B; // error prop is missing
         ~
 !!! error TS2322: Type 'typeof B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'prop' is missing in type 'typeof B'.
+!!! error TS2322:   Property 'prop' is missing in type typeof B' but present in type 'A'.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:13:5: Did you mean to use 'new' with this expression?
     a = C;
     
     var b: B = new C(); // error prop is missing
         ~
 !!! error TS2322: Type 'C' is not assignable to type 'B'.
-!!! error TS2322:   Property 'prop' is missing in type 'C'.
+!!! error TS2322:   Property 'prop' is missing in type C' but present in type 'B'.
     b = B; // error prop is missing
         ~
 !!! error TS2322: Type 'typeof B' is not assignable to type 'B'.
-!!! error TS2322:   Property 'prop' is missing in type 'typeof B'.
+!!! error TS2322:   Property 'prop' is missing in type typeof B' but present in type 'B'.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:17:5: Did you mean to use 'new' with this expression?
     b = C;
     b = a;
diff --git a/tests/baselines/reference/strictBindCallApply1.errors.txt b/tests/baselines/reference/strictBindCallApply1.errors.txt
index e998238a8f7ba..0846445548ede 100644
--- a/tests/baselines/reference/strictBindCallApply1.errors.txt
+++ b/tests/baselines/reference/strictBindCallApply1.errors.txt
@@ -2,8 +2,7 @@ tests/cases/conformance/functions/strictBindCallApply1.ts(6,35): error TS2345: A
 tests/cases/conformance/functions/strictBindCallApply1.ts(9,11): error TS2554: Expected 3 arguments, but got 2.
 tests/cases/conformance/functions/strictBindCallApply1.ts(10,35): error TS2345: Argument of type '20' is not assignable to parameter of type 'string'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(11,11): error TS2554: Expected 3 arguments, but got 4.
-tests/cases/conformance/functions/strictBindCallApply1.ts(14,32): error TS2345: Argument of type '[number]' is not assignable to parameter of type '[number, string]'.
-  Property '1' is missing in type '[number]'.
+tests/cases/conformance/functions/strictBindCallApply1.ts(14,32): error TS2737: Property '1' is missing in type [number]' but present in type '[number, string]'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(15,37): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(16,32): error TS2345: Argument of type '[number, string, number]' is not assignable to parameter of type '[number, string]'.
   Types of property 'length' are incompatible.
@@ -51,8 +50,7 @@ tests/cases/conformance/functions/strictBindCallApply1.ts(57,12): error TS2345:
     let a00 = foo.apply(undefined, [10, "hello"]);
     let a01 = foo.apply(undefined, [10]);  // Error
                                    ~~~~
-!!! error TS2345: Argument of type '[number]' is not assignable to parameter of type '[number, string]'.
-!!! error TS2345:   Property '1' is missing in type '[number]'.
+!!! error TS2737: Property '1' is missing in type [number]' but present in type '[number, string]'.
     let a02 = foo.apply(undefined, [10, 20]);  // Error
                                         ~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
index 965bbee0ea1c7..de17a007b5638 100644
--- a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
+++ b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
@@ -76,7 +76,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(84,1): error TS2322: Type 'Fun
   Type 'Func<string, void>' is not assignable to type 'Func<Object, void>'.
 tests/cases/compiler/strictFunctionTypesErrors.ts(111,1): error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
   Type 'Animal' is not assignable to type 'Dog'.
-    Property 'dog' is missing in type 'Animal'.
+    Property 'dog' is missing in type Animal' but present in type 'Dog'.
 tests/cases/compiler/strictFunctionTypesErrors.ts(126,1): error TS2322: Type 'Crate<Dog>' is not assignable to type 'Crate<Animal>'.
   Types of property 'onSetItem' are incompatible.
     Type '(item: Dog) => void' is not assignable to type '(item: Animal) => void'.
@@ -321,7 +321,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(155,5): error TS2322: Type '(c
     ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
 !!! error TS2322:   Type 'Animal' is not assignable to type 'Dog'.
-!!! error TS2322:     Property 'dog' is missing in type 'Animal'.
+!!! error TS2322:     Property 'dog' is missing in type Animal' but present in type 'Dog'.
     dogComparer2 = animalComparer2;  // Ok
     
     // Crate<T> is invariant in --strictFunctionTypes mode
diff --git a/tests/baselines/reference/strictTupleLength.errors.txt b/tests/baselines/reference/strictTupleLength.errors.txt
index a4a51cc9b0f4b..6b7a1fd7e8c6b 100644
--- a/tests/baselines/reference/strictTupleLength.errors.txt
+++ b/tests/baselines/reference/strictTupleLength.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/tuple/strictTupleLength.ts(11,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't1' must be of type '[number]', but here has type '[number, number]'.
 tests/cases/conformance/types/tuple/strictTupleLength.ts(12,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't2' must be of type '[number, number]', but here has type '[number]'.
 tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2322: Type 'number[]' is not assignable to type '[number]'.
-  Property '0' is missing in type 'number[]'.
+  Property '0' is missing in type number[]' but present in type '[number]'.
 
 
 ==== tests/cases/conformance/types/tuple/strictTupleLength.ts (3 errors) ====
@@ -29,6 +29,6 @@ tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2322: Ty
     t1 = arr; // error with or without strict
     ~~
 !!! error TS2322: Type 'number[]' is not assignable to type '[number]'.
-!!! error TS2322:   Property '0' is missing in type 'number[]'.
+!!! error TS2322:   Property '0' is missing in type number[]' but present in type '[number]'.
     arr = t1; // ok with or without strict
     
\ No newline at end of file
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
index d95bc55a6bb2d..f71f13f93ea82 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
@@ -5,9 +5,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(31,5): error TS2411: Property 'c' of type 'number' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(32,5): error TS2411: Property 'd' of type 'string' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(37,8): error TS2322: Type 'typeof A' is not assignable to type 'A'.
-  Property 'foo' is missing in type 'typeof A'.
+  Property 'foo' is missing in type typeof A' but present in type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(38,8): error TS2322: Type 'typeof B' is not assignable to type 'A'.
-  Property 'foo' is missing in type 'typeof B'.
+  Property 'foo' is missing in type typeof B' but present in type 'A'.
 
 
 ==== tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts (8 errors) ====
@@ -62,11 +62,11 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
         a: A,
            ~
 !!! error TS2322: Type 'typeof A' is not assignable to type 'A'.
-!!! error TS2322:   Property 'foo' is missing in type 'typeof A'.
+!!! error TS2322:   Property 'foo' is missing in type typeof A' but present in type 'A'.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:37:8: Did you mean to use 'new' with this expression?
         b: B
            ~
 !!! error TS2322: Type 'typeof B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'foo' is missing in type 'typeof B'.
+!!! error TS2322:   Property 'foo' is missing in type typeof B' but present in type 'A'.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:38:8: Did you mean to use 'new' with this expression?
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
index 318b64d933170..edc797e87830b 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts(11,11): error TS2430: Interface 'B' incorrectly extends interface 'A'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+    Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts(24,27): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts(32,15): error TS2430: Interface 'B3<T>' incorrectly extends interface 'A<T>'.
   Index signatures are incompatible.
@@ -29,8 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Index signatures are incompatible.
-!!! error TS2430:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2430:       Property 'bar' is missing in type 'Base'.
+!!! error TS2430:     Property 'bar' is missing in type Base' but present in type 'Derived'.
         [x: number]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
index 6f2684ae93b7e..b3c8f6f80e39f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts(11,7): error TS2415: Class 'B' incorrectly extends base class 'A'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+    Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts(24,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts(32,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
@@ -29,8 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
           ~
 !!! error TS2415: Class 'B' incorrectly extends base class 'A'.
 !!! error TS2415:   Index signatures are incompatible.
-!!! error TS2415:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2415:       Property 'bar' is missing in type 'Base'.
+!!! error TS2415:     Property 'bar' is missing in type Base' but present in type 'Derived'.
         [x: number]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
index 3f6de942d2597..5931bb55cea68 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
@@ -4,8 +4,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,11): error TS2415: Class 'B' incorrectly extends base class 'A<Base>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'Base'.
-tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
-  Property 'bar' is missing in type 'Base'.
+tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,23): error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(24,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -41,8 +40,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
-!!! error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
-!!! error TS2344:   Property 'bar' is missing in type 'Base'.
+!!! error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
             [x: number]: string; // error
         }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
index be4afeafcde66..c8078b4983491 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts(11,7): error TS2420: Class 'B' incorrectly implements interface 'A'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+      Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts(32,11): error TS2420: Class 'B3<T>' incorrectly implements interface 'A<T>'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'T'.
@@ -29,7 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2420: Class 'B' incorrectly implements interface 'A'.
 !!! error TS2420:   Index signatures are incompatible.
 !!! error TS2420:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2420:       Property 'bar' is missing in type 'Base'.
+!!! error TS2420:       Property 'bar' is missing in type Base' but present in type 'Derived'.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
index eaea4db7d62f1..630a21cf6e272 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts(17,15): error TS2430: Interface 'B' incorrectly extends interface 'A'.
   Types of property 'bar' are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+    Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts(27,15): error TS2430: Interface 'B2' incorrectly extends interface 'A2'.
   Types of property '2.0' are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
@@ -40,8 +39,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
                   ~
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Types of property 'bar' are incompatible.
-!!! error TS2430:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2430:       Property 'bar' is missing in type 'Base'.
+!!! error TS2430:     Property 'bar' is missing in type Base' but present in type 'Derived'.
             foo: Derived; // ok
             bar: Base; // error
         }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
index 022f91381088f..b3dcf5a1bde16 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(16,11): error TS2420: Class 'B' incorrectly implements interface 'A'.
-  Property 'foo' is missing in type 'B'.
+  Property 'foo' is missing in type B' but present in type 'A'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(24,11): error TS2420: Class 'B2' incorrectly implements interface 'A2'.
-  Property '1' is missing in type 'B2'.
+  Property '1' is missing in type B2' but present in type 'A2'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(32,11): error TS2420: Class 'B3' incorrectly implements interface 'A3'.
-  Property ''1'' is missing in type 'B3'.
+  Property ''1'' is missing in type B3' but present in type 'A3'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(43,11): error TS2559: Type 'B' has no properties in common with type 'A'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(51,11): error TS2559: Type 'B2' has no properties in common with type 'A2'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(59,11): error TS2559: Type 'B3' has no properties in common with type 'A3'.
@@ -28,7 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
         class B implements A {
               ~
 !!! error TS2420: Class 'B' incorrectly implements interface 'A'.
-!!! error TS2420:   Property 'foo' is missing in type 'B'.
+!!! error TS2420:   Property 'foo' is missing in type B' but present in type 'A'.
             fooo: Derived; // error
         }
     
@@ -39,7 +39,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
         class B2 implements A2 {
               ~~
 !!! error TS2420: Class 'B2' incorrectly implements interface 'A2'.
-!!! error TS2420:   Property '1' is missing in type 'B2'.
+!!! error TS2420:   Property '1' is missing in type B2' but present in type 'A2'.
             2: Derived; // error
         }
     
@@ -50,7 +50,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
         class B3 implements A3 {
               ~~
 !!! error TS2420: Class 'B3' incorrectly implements interface 'A3'.
-!!! error TS2420:   Property ''1'' is missing in type 'B3'.
+!!! error TS2420:   Property ''1'' is missing in type B3' but present in type 'A3'.
             '1.0': Derived; // error
         }
     }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
index 82f6229b20c6a..5ee0ecf3888d5 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts(11,11): error TS2430: Interface 'B' incorrectly extends interface 'A'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+    Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts(24,27): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts(32,15): error TS2430: Interface 'B3<T>' incorrectly extends interface 'A<T>'.
   Index signatures are incompatible.
@@ -29,8 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Index signatures are incompatible.
-!!! error TS2430:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2430:       Property 'bar' is missing in type 'Base'.
+!!! error TS2430:     Property 'bar' is missing in type Base' but present in type 'Derived'.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
index 205ecf780cb7e..cae4456ac385b 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts(11,7): error TS2415: Class 'B' incorrectly extends base class 'A'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
+    Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts(24,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts(32,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
@@ -29,8 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
           ~
 !!! error TS2415: Class 'B' incorrectly extends base class 'A'.
 !!! error TS2415:   Index signatures are incompatible.
-!!! error TS2415:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2415:       Property 'bar' is missing in type 'Base'.
+!!! error TS2415:     Property 'bar' is missing in type Base' but present in type 'Derived'.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
index 8d4328cdd2dba..3c17778cd20a6 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
@@ -4,8 +4,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,11): error TS2415: Class 'B' incorrectly extends base class 'A<Base>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'Base'.
-tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
-  Property 'bar' is missing in type 'Base'.
+tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,23): error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(24,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -41,8 +40,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
-!!! error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
-!!! error TS2344:   Property 'bar' is missing in type 'Base'.
+!!! error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
             [x: string]: string; // error
         }
     
diff --git a/tests/baselines/reference/symbolProperty10.errors.txt b/tests/baselines/reference/symbolProperty10.errors.txt
index 513d5792c5eaf..c23714712d311 100644
--- a/tests/baselines/reference/symbolProperty10.errors.txt
+++ b/tests/baselines/reference/symbolProperty10.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Type 'I' is not assignable to type 'C'.
   Types of property '[Symbol.iterator]' are incompatible.
     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-      Property 'y' is missing in type '{ x: any; }'.
+      Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty10.ts (1 errors) ====
@@ -19,4 +19,4 @@ tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Typ
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
 !!! error TS2322:     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-!!! error TS2322:       Property 'y' is missing in type '{ x: any; }'.
\ No newline at end of file
+!!! error TS2322:       Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolProperty25.errors.txt b/tests/baselines/reference/symbolProperty25.errors.txt
index a6cde31c1adcd..238fd635a2421 100644
--- a/tests/baselines/reference/symbolProperty25.errors.txt
+++ b/tests/baselines/reference/symbolProperty25.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/Symbols/symbolProperty25.ts(5,7): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property '[Symbol.toPrimitive]' is missing in type 'C'.
+  Property '[Symbol.toPrimitive]' is missing in type C' but present in type 'I'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty25.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty25.ts(5,7): error TS2420: Clas
     class C implements I {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property '[Symbol.toPrimitive]' is missing in type 'C'.
+!!! error TS2420:   Property '[Symbol.toPrimitive]' is missing in type C' but present in type 'I'.
         [Symbol.toStringTag]() {
             return "";
         }
diff --git a/tests/baselines/reference/symbolProperty52.errors.txt b/tests/baselines/reference/symbolProperty52.errors.txt
index 5a44918d56489..f30fa5aa75fd2 100644
--- a/tests/baselines/reference/symbolProperty52.errors.txt
+++ b/tests/baselines/reference/symbolProperty52.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(2,13): error TS2339: Property 'nonsense' does not exist on type 'SymbolConstructor'.
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(5,1): error TS2322: Type '{}' is not assignable to type '{ [Symbol.nonsense]: number; }'.
-  Property '[Symbol.nonsense]' is missing in type '{}'.
+  Property '[Symbol.nonsense]' is missing in type {}' but present in type '{ [Symbol.nonsense]: number; }'.
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Property 'nonsense' does not exist on type 'SymbolConstructor'.
 
 
@@ -14,7 +14,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Pro
     obj = {};
     ~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ [Symbol.nonsense]: number; }'.
-!!! error TS2322:   Property '[Symbol.nonsense]' is missing in type '{}'.
+!!! error TS2322:   Property '[Symbol.nonsense]' is missing in type {}' but present in type '{ [Symbol.nonsense]: number; }'.
     
     obj[Symbol.nonsense];
                ~~~~~~~~
diff --git a/tests/baselines/reference/symbolProperty9.errors.txt b/tests/baselines/reference/symbolProperty9.errors.txt
index e621ab6c5a6ee..2796e4a3ba9e1 100644
--- a/tests/baselines/reference/symbolProperty9.errors.txt
+++ b/tests/baselines/reference/symbolProperty9.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type 'I' is not assignable to type 'C'.
   Types of property '[Symbol.iterator]' are incompatible.
     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-      Property 'y' is missing in type '{ x: any; }'.
+      Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty9.ts (1 errors) ====
@@ -19,4 +19,4 @@ tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
 !!! error TS2322:     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-!!! error TS2322:       Property 'y' is missing in type '{ x: any; }'.
\ No newline at end of file
+!!! error TS2322:       Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
index 109312d626489..07111aaaccbb0 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(9,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type 'undefined[]'.
+tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(9,13): error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(10,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(11,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(12,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
@@ -20,8 +19,7 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     
     var a = foo([]);             // number
                 ~~
-!!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type 'undefined[]'.
+!!! error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
     var b = foo([], 1);          // string
                 ~~
 !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
index 0d2cafea7b32b..88a3ff4c628a5 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(9,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type 'undefined[]'.
+tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(9,13): error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(10,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(11,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(12,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
@@ -20,8 +19,7 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     
     var a = foo([]);             // number
                 ~~
-!!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type 'undefined[]'.
+!!! error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
     var b = foo([], 1);          // string
                 ~~
 !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
index 2c11f638a8abf..5ab21279ba607 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(7,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{}'.
+tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(7,3): error TS2736: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (1 errors) ====
@@ -11,7 +10,6 @@ tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(7,3): error TS2
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{}'.
+!!! error TS2736: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
index 26063c45a0f68..ea4df0e245598 100644
--- a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(4,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{}'.
+tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(4,3): error TS2736: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts (1 errors) ====
@@ -8,7 +7,6 @@ tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(4,3): error TS
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{}'.
+!!! error TS2736: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
index c1bb393c2137a..05df89576de32 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(7,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{}'.
+tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(7,3): error TS2736: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 16 more.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (1 errors) ====
@@ -11,7 +10,6 @@ tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(7,3): error T
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{}'.
+!!! error TS2736: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 16 more.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
index da1a8de6fd688..d89032b821530 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -16,8 +16,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(67,1): err
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(68,1): error TS2684: The 'this' context of type '{ y: string; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
   Types of property 'y' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2684: The 'this' context of type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
-  Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2737: Property 'y' is missing in type { wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(72,1): error TS2554: Expected 1 arguments, but got 0.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(73,13): error TS2345: Argument of type '"wrong type"' is not assignable to parameter of type 'number'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(74,1): error TS2554: Expected 1 arguments, but got 2.
@@ -36,11 +35,11 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(86,5): err
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(107,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type 'C' is not assignable to type 'D'.
-      Property 'x' is missing in type 'C'.
+      Type 'C' is missing the following properties from type 'D': x, explicitD
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(108,1): error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type '{ n: number; }' is not assignable to type '{ x: number; }'.
-      Property 'x' is missing in type '{ n: number; }'.
+      Property 'x' is missing in type { n: number; }' but present in type '{ x: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(110,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type 'C' is not assignable to type 'D'.
@@ -56,7 +55,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(113,1): er
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(114,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type '{ n: number; }' is not assignable to type 'D'.
-      Property 'x' is missing in type '{ n: number; }'.
+      Type '{ n: number; }' is missing the following properties from type 'D': x, explicitThis, explicitD
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(115,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(116,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
   The 'this' types of each signature are incompatible.
@@ -68,7 +67,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(125,69): e
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(145,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
   The 'this' types of each signature are incompatible.
     Type 'Base1' is not assignable to type 'Base2'.
-      Property 'y' is missing in type 'Base1'.
+      Property 'y' is missing in type Base1' but present in type 'Base2'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(146,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
   The 'this' types of each signature are incompatible.
     Type 'Base1' is not assignable to type 'Base2'.
@@ -202,8 +201,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2684:     Type 'string' is not assignable to type 'number'.
     wrongPropertyName.f(13);
     ~~~~~~~~~~~~~~~~~
-!!! error TS2684: The 'this' context of type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
-!!! error TS2684:   Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+!!! error TS2737: Property 'y' is missing in type { wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
     
     let c = new C();
     c.explicitC(); // not enough arguments
@@ -278,13 +276,13 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type 'C' is not assignable to type 'D'.
-!!! error TS2322:       Property 'x' is missing in type 'C'.
+!!! error TS2322:       Type 'C' is missing the following properties from type 'D': x, explicitD
     c.explicitProperty = explicitXProperty;
     ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type '{ n: number; }' is not assignable to type '{ x: number; }'.
-!!! error TS2322:       Property 'x' is missing in type '{ n: number; }'.
+!!! error TS2322:       Property 'x' is missing in type { n: number; }' but present in type '{ x: number; }'.
     
     c.explicitC = d.explicitD;
     ~~~~~~~~~~~
@@ -311,7 +309,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type '{ n: number; }' is not assignable to type 'D'.
-!!! error TS2322:       Property 'x' is missing in type '{ n: number; }'.
+!!! error TS2322:       Type '{ n: number; }' is missing the following properties from type 'D': x, explicitThis, explicitD
     c.explicitThis = d.explicitThis;
     ~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
@@ -359,7 +357,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type 'Base1' is not assignable to type 'Base2'.
-!!! error TS2322:       Property 'y' is missing in type 'Base1'.
+!!! error TS2322:       Property 'y' is missing in type Base1' but present in type 'Base2'.
     b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
     ~~~~~~~~~~~
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
diff --git a/tests/baselines/reference/tsxAttributeResolution1.errors.txt b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
index 5cc3a8024a007..e969584dbefb0 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/jsx/file.tsx(26,8): error TS2322: Type 'string' is not a
 tests/cases/conformance/jsx/file.tsx(27,2): error TS2322: Type '{ var: string; }' is not assignable to type 'Attribs1'.
   Property 'var' does not exist on type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
-  Property 'reqd' is missing in type '{}'.
+  Property 'reqd' is missing in type {}' but present in type '{ reqd: string; }'.
 tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -58,7 +58,7 @@ tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not a
     <test2 />; // Error, missing reqd
      ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
-!!! error TS2322:   Property 'reqd' is missing in type '{}'.
+!!! error TS2322:   Property 'reqd' is missing in type {}' but present in type '{ reqd: string; }'.
     <test2 reqd={10} />; // Error, reqd is not string
            ~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxAttributeResolution12.errors.txt b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
index 802a3b1d9d54e..24bce229659ca 100644
--- a/tests/baselines/reference/tsxAttributeResolution12.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/jsx/file.tsx(25,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
   Type '{}' is not assignable to type '{ reqd: any; }'.
-    Property 'reqd' is missing in type '{}'.
+    Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
 tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
   Type '{}' is not assignable to type '{ reqd: any; }'.
-    Property 'reqd' is missing in type '{}'.
+    Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
 
 
 ==== tests/cases/conformance/jsx/react.d.ts (0 errors) ====
@@ -48,13 +48,13 @@ tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assi
               ~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ reqd: any; }'.
-!!! error TS2322:     Property 'reqd' is missing in type '{}'.
+!!! error TS2322:     Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
     
     // Should error
     var t2 = <TestMod.Test />;
               ~~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ reqd: any; }'.
-!!! error TS2322:     Property 'reqd' is missing in type '{}'.
+!!! error TS2322:     Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution3.errors.txt b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
index be963c16e1c59..b19cd59769ff4 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/jsx/file.tsx(19,2): error TS2322: Type '{ x: number; }'
   Types of property 'x' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(23,2): error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'.
-  Property 'x' is missing in type '{ y: number; }'.
+  Property 'x' is missing in type { y: number; }' but present in type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -36,7 +36,7 @@ tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not a
     <test1 {...obj3} />
      ~~~~~
 !!! error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Property 'x' is missing in type '{ y: number; }'.
+!!! error TS2322:   Property 'x' is missing in type { y: number; }' but present in type 'Attribs1'.
     
     // OK
     var obj4 = { x: 32, y: 32 };
diff --git a/tests/baselines/reference/tsxAttributeResolution5.errors.txt b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
index 92b8a254c1fe1..e101ac06a5b0f 100644
--- a/tests/baselines/reference/tsxAttributeResolution5.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
@@ -4,9 +4,9 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type 'T' is not assig
       Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(25,10): error TS2322: Type 'T' is not assignable to type 'Attribs1'.
   Type '{ y: string; }' is not assignable to type 'Attribs1'.
-    Property 'x' is missing in type '{ y: string; }'.
+    Property 'x' is missing in type { y: string; }' but present in type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assignable to type 'Attribs1'.
-  Property 'x' is missing in type '{}'.
+  Property 'x' is missing in type {}' but present in type 'Attribs1'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -43,13 +43,13 @@ tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assig
     	        ~~~~~
 !!! error TS2322: Type 'T' is not assignable to type 'Attribs1'.
 !!! error TS2322:   Type '{ y: string; }' is not assignable to type 'Attribs1'.
-!!! error TS2322:     Property 'x' is missing in type '{ y: string; }'.
+!!! error TS2322:     Property 'x' is missing in type { y: string; }' but present in type 'Attribs1'.
     }
     
     
     <test1 {...{}} />; // Error, missing x
      ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Property 'x' is missing in type '{}'.
+!!! error TS2322:   Property 'x' is missing in type {}' but present in type 'Attribs1'.
     <test2 {...{}} />; // Error, missing toString
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution6.errors.txt b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
index 6b2657bdb36ae..e37172eea92af 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/jsx/file.tsx(10,8): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(11,8): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(12,2): error TS2322: Type '{}' is not assignable to type '{ n: boolean; }'.
-  Property 'n' is missing in type '{}'.
+  Property 'n' is missing in type {}' but present in type '{ n: boolean; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -25,7 +25,7 @@ tests/cases/conformance/jsx/file.tsx(12,2): error TS2322: Type '{}' is not assig
     <test2 />;
      ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ n: boolean; }'.
-!!! error TS2322:   Property 'n' is missing in type '{}'.
+!!! error TS2322:   Property 'n' is missing in type {}' but present in type '{ n: boolean; }'.
     
     // OK
     <test1 n />;
diff --git a/tests/baselines/reference/tsxInvokeComponentType.errors.txt b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
index 75f9e4ad5d6fd..fed68d449a614 100644
--- a/tests/baselines/reference/tsxInvokeComponentType.errors.txt
+++ b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { someKey: string; } & { children?: ReactNode; }'.
   Type '{}' is not assignable to type '{ someKey: string; }'.
-    Property 'someKey' is missing in type '{}'.
+    Property 'someKey' is missing in type {}' but present in type '{ someKey: string; }'.
 
 
 ==== tests/cases/compiler/tsxInvokeComponentType.tsx (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2322: Type '{}' i
                  ~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { someKey: string; } & { children?: ReactNode; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ someKey: string; }'.
-!!! error TS2322:     Property 'someKey' is missing in type '{}'.
+!!! error TS2322:     Property 'someKey' is missing in type {}' but present in type '{ someKey: string; }'.
     
     const good = <Elem someKey="ok" />;
     
diff --git a/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt b/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt
index 95e1063e1d781..d6e1cc5b3383d 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(55,12): error TS2322: Type '{ foo: number; }' is not assignable to type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
   Type '{ foo: number; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }'.
-    Property 'bar' is missing in type '{ foo: number; }'.
+    Type '{ foo: number; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }': bar, baz
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(57,12): error TS2322: Type '{ bar: string; baz: string; bat: string; }' is not assignable to type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
   Property 'bat' does not exist on type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(59,42): error TS2322: Type 'null' is not assignable to type 'string'.
@@ -11,7 +11,7 @@ tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(80,12): error TS2322
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(81,29): error TS2322: Type 'string' is not assignable to type 'number | undefined'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(98,12): error TS2322: Type '{ foo: string; }' is not assignable to type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
   Type '{ foo: string; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }'.
-    Property 'bar' is missing in type '{ foo: string; }'.
+    Type '{ foo: string; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }': bar, baz
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(100,12): error TS2322: Type '{ bar: string; baz: number; bat: string; }' is not assignable to type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
   Property 'bat' does not exist on type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(102,57): error TS2322: Type 'null' is not assignable to type 'number'.
@@ -82,7 +82,7 @@ tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(123,49): error TS232
                ~~~~~~~~~
 !!! error TS2322: Type '{ foo: number; }' is not assignable to type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
 !!! error TS2322:   Type '{ foo: number; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }'.
-!!! error TS2322:     Property 'bar' is missing in type '{ foo: number; }'.
+!!! error TS2322:     Type '{ foo: number; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }': bar, baz
     const c = <Component bar="yes" baz="yeah" />;
     const d = <Component bar="yes" baz="yo" bat="ohno" />; // Error, baz not a valid prop
                ~~~~~~~~~
@@ -146,7 +146,7 @@ tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(123,49): error TS232
                ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ foo: string; }' is not assignable to type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
 !!! error TS2322:   Type '{ foo: string; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }'.
-!!! error TS2322:     Property 'bar' is missing in type '{ foo: string; }'.
+!!! error TS2322:     Type '{ foo: string; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }': bar, baz
     const p = <BothWithSpecifiedGeneric bar="yes" baz={12} />;
     const q = <BothWithSpecifiedGeneric bar="yes" baz={12} bat="ohno" />; // Error, baz not a valid prop
                ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
index 18180f8b688c2..f041816bf94d3 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsx/file.tsx(13,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'.
   Type '{}' is not assignable to type 'Prop'.
-    Property 'a' is missing in type '{}'.
+    Type '{}' is missing the following properties from type 'Prop': a, b
 tests/cases/conformance/jsx/file.tsx(19,18): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
@@ -21,7 +21,7 @@ tests/cases/conformance/jsx/file.tsx(19,18): error TS2322: Type 'string' is not
               ~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'.
 !!! error TS2322:   Type '{}' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'a' is missing in type '{}'.
+!!! error TS2322:     Type '{}' is missing the following properties from type 'Prop': a, b
     
     // OK
     let x = <MyComp a={10} b="hi" />
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
index accecdff013f8..65081baacb135 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/jsx/file.tsx(11,10): error TS2322: Type '{ property1: string; property2: number; }' is not assignable to type 'AnotherComponentProps'.
-  Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }'.
+  Property 'AnotherProperty1' is missing in type { property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/conformance/jsx/file.tsx(11,10): error TS2322: Type '{ property1: st
             <AnotherComponent {...props} />
              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ property1: string; property2: number; }' is not assignable to type 'AnotherComponentProps'.
-!!! error TS2322:   Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }'.
+!!! error TS2322:   Property 'AnotherProperty1' is missing in type { property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
         );
     }
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
index 1ea7dc4ad2654..d0860b73087a1 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{}' is not assignable to type 'PoisonedProp'.
-  Property 'x' is missing in type '{}'.
+  Type '{}' is missing the following properties from type 'PoisonedProp': x, y
 tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'.
   Type '{}' is not assignable to type 'PoisonedProp'.
-    Property 'x' is missing in type '{}'.
+    Type '{}' is missing the following properties from type 'PoisonedProp': x, y
 tests/cases/conformance/jsx/file.tsx(22,19): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(22,21): error TS2322: Type 'true' is not assignable to type '"2"'.
 tests/cases/conformance/jsx/file.tsx(23,10): error TS2322: Type '{ x: number; y: "2"; }' is not assignable to type 'PoisonedProp'.
@@ -35,12 +35,12 @@ tests/cases/conformance/jsx/file.tsx(24,11): error TS2322: Type '{ X: string; x:
     let p = <Poisoned {...obj} />;
              ~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'PoisonedProp'.
-!!! error TS2322:   Property 'x' is missing in type '{}'.
+!!! error TS2322:   Type '{}' is missing the following properties from type 'PoisonedProp': x, y
     let y = <Poisoned />;
              ~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'.
 !!! error TS2322:   Type '{}' is not assignable to type 'PoisonedProp'.
-!!! error TS2322:     Property 'x' is missing in type '{}'.
+!!! error TS2322:     Type '{}' is missing the following properties from type 'PoisonedProp': x, y
     let z = <Poisoned x y/>;
                       ~
 !!! error TS2322: Type 'true' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
index 586be36c850ad..0dbc56106a77c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
   Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; }'.
     Type '{ editable: true; }' is not assignable to type '{ editable: true; onEdit: (newText: string) => void; }'.
-      Property 'onEdit' is missing in type '{ editable: true; }'.
+      Property 'onEdit' is missing in type { editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -22,7 +22,7 @@ tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: tru
 !!! error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
 !!! error TS2322:   Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; }'.
 !!! error TS2322:     Type '{ editable: true; }' is not assignable to type '{ editable: true; onEdit: (newText: string) => void; }'.
-!!! error TS2322:       Property 'onEdit' is missing in type '{ editable: true; }'.
+!!! error TS2322:       Property 'onEdit' is missing in type { editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
     
     const textProps: TextProps = {
         editable: false
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
index 04a0a4f736bee..f4f87f1145edd 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/jsx/file.tsx(12,13): error TS2322: Type '{ extraProp: tr
   Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
 tests/cases/conformance/jsx/file.tsx(13,13): error TS2322: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
   Type '{ yy: number; }' is not assignable to type '{ yy: number; yy1: string; }'.
-    Property 'yy1' is missing in type '{ yy: number; }'.
+    Property 'yy1' is missing in type { yy: number; }' but present in type '{ yy: number; yy1: string; }'.
 tests/cases/conformance/jsx/file.tsx(14,31): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(16,13): error TS2322: Type '{ y1: number; yy: number; yy1: string; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
   Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
@@ -11,7 +11,7 @@ tests/cases/conformance/jsx/file.tsx(17,13): error TS2322: Type '{ yy: boolean;
     Type 'boolean' is not assignable to type 'number'.
 tests/cases/conformance/jsx/file.tsx(25,13): error TS2322: Type '{ extra-data: true; }' is not assignable to type 'IntrinsicAttributes & { yy: string; direction?: number; }'.
   Type '{ extra-data: true; }' is not assignable to type '{ yy: string; direction?: number; }'.
-    Property 'yy' is missing in type '{ extra-data: true; }'.
+    Property 'yy' is missing in type { extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
 tests/cases/conformance/jsx/file.tsx(26,40): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/jsx/file.tsx(33,32): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(34,29): error TS2322: Type 'string' is not assignable to type 'boolean'.
@@ -38,7 +38,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
                 ~~~~~~~~
 !!! error TS2322: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
 !!! error TS2322:   Type '{ yy: number; }' is not assignable to type '{ yy: number; yy1: string; }'.
-!!! error TS2322:     Property 'yy1' is missing in type '{ yy: number; }'.
+!!! error TS2322:     Property 'yy1' is missing in type { yy: number; }' but present in type '{ yy: number; yy1: string; }'.
     const c2 = <OneThing {...obj} yy1 />; // type incompatible;
                                   ~~~
 !!! error TS2322: Type 'true' is not assignable to type 'string'.
@@ -64,7 +64,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
                 ~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ extra-data: true; }' is not assignable to type 'IntrinsicAttributes & { yy: string; direction?: number; }'.
 !!! error TS2322:   Type '{ extra-data: true; }' is not assignable to type '{ yy: string; direction?: number; }'.
-!!! error TS2322:     Property 'yy' is missing in type '{ extra-data: true; }'.
+!!! error TS2322:     Property 'yy' is missing in type { extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
     const d2 = <TestingOneThing yy="hello" direction="left" />
                                            ~~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
index a5637287530c5..8229c54772ac4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/jsx/file.tsx(29,10): error TS2322: Type '{ naaaaaaame: s
   Property 'naaaaaaame' does not exist on type 'IntrinsicAttributes & { name?: string; }'.
 tests/cases/conformance/jsx/file.tsx(34,10): error TS2322: Type '{ extra-prop-name: string; }' is not assignable to type 'IntrinsicAttributes & { "prop-name": string; }'.
   Type '{ extra-prop-name: string; }' is not assignable to type '{ "prop-name": string; }'.
-    Property '"prop-name"' is missing in type '{ extra-prop-name: string; }'.
+    Property '"prop-name"' is missing in type { extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
 tests/cases/conformance/jsx/file.tsx(37,10): error TS2322: Type '{ prop1: true; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'prop1' does not exist on type 'IntrinsicAttributes'.
 tests/cases/conformance/jsx/file.tsx(38,11): error TS2322: Type '{ ref: (x: any) => any; }' is not assignable to type 'IntrinsicAttributes'.
@@ -60,7 +60,7 @@ tests/cases/conformance/jsx/file.tsx(45,11): error TS2559: Type '{ prop1: boolea
              ~~~~~~~~~~~~
 !!! error TS2322: Type '{ extra-prop-name: string; }' is not assignable to type 'IntrinsicAttributes & { "prop-name": string; }'.
 !!! error TS2322:   Type '{ extra-prop-name: string; }' is not assignable to type '{ "prop-name": string; }'.
-!!! error TS2322:     Property '"prop-name"' is missing in type '{ extra-prop-name: string; }'.
+!!! error TS2322:     Property '"prop-name"' is missing in type { extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
     
     // Error
     let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
index bebae6786f97a..b5693849e9e52 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/jsx/file.tsx(9,15): error TS2322: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: number; }'.
   Type '{ a: number; }' is not assignable to type '{ b: {}; a: number; }'.
-    Property 'b' is missing in type '{ a: number; }'.
+    Property 'b' is missing in type { a: number; }' but present in type '{ b: {}; a: number; }'.
 tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
   Type 'T & { ignore-prop: true; }' is not assignable to type '{ b: {}; a: {}; }'.
-    Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }'.
+    Property 'a' is missing in type { b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (2 errors) ====
@@ -19,10 +19,10 @@ tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-pr
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: number; }'.
 !!! error TS2322:   Type '{ a: number; }' is not assignable to type '{ b: {}; a: number; }'.
-!!! error TS2322:     Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2322:     Property 'b' is missing in type { a: number; }' but present in type '{ b: {}; a: number; }'.
         let a2 = <OverloadComponent {...arg1} ignore-prop />  // missing a
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
 !!! error TS2322:   Type 'T & { ignore-prop: true; }' is not assignable to type '{ b: {}; a: {}; }'.
-!!! error TS2322:     Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }'.
+!!! error TS2322:     Property 'a' is missing in type { b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxUnionElementType6.errors.txt b/tests/baselines/reference/tsxUnionElementType6.errors.txt
index 2aa4ab13537d2..766b25e587fb1 100644
--- a/tests/baselines/reference/tsxUnionElementType6.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType6.errors.txt
@@ -3,10 +3,10 @@ tests/cases/conformance/jsx/file.tsx(18,10): error TS2322: Type '{ x: true; }' i
 tests/cases/conformance/jsx/file.tsx(19,27): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
   Type '{}' is not assignable to type '{ x: boolean; }'.
-    Property 'x' is missing in type '{}'.
+    Property 'x' is missing in type {}' but present in type '{ x: boolean; }'.
 tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{ data-prop: true; }' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
   Type '{ data-prop: true; }' is not assignable to type '{ x: boolean; }'.
-    Property 'x' is missing in type '{ data-prop: true; }'.
+    Property 'x' is missing in type { data-prop: true; }' but present in type '{ x: boolean; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (4 errors) ====
@@ -39,11 +39,11 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{ data-prop: tr
              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ x: boolean; }'.
-!!! error TS2322:     Property 'x' is missing in type '{}'.
+!!! error TS2322:     Property 'x' is missing in type {}' but present in type '{ x: boolean; }'.
     let d = <SFC2AndEmptyComp data-prop />;
              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ data-prop: true; }' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
 !!! error TS2322:   Type '{ data-prop: true; }' is not assignable to type '{ x: boolean; }'.
-!!! error TS2322:     Property 'x' is missing in type '{ data-prop: true; }'.
+!!! error TS2322:     Property 'x' is missing in type { data-prop: true; }' but present in type '{ x: boolean; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tupleTypes.errors.txt b/tests/baselines/reference/tupleTypes.errors.txt
index 95daf5ce0ef97..1b27e7afff0de 100644
--- a/tests/baselines/reference/tupleTypes.errors.txt
+++ b/tests/baselines/reference/tupleTypes.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/tupleTypes.ts(11,12): error TS2339: Property '2' does not exist on type '[number, string]'.
 tests/cases/compiler/tupleTypes.ts(12,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't2' must be of type 'undefined', but here has type 'string | number'.
 tests/cases/compiler/tupleTypes.ts(14,1): error TS2322: Type '[]' is not assignable to type '[number, string]'.
-  Property '0' is missing in type '[]'.
+  Type '[]' is missing the following properties from type '[number, string]': 0, 1
 tests/cases/compiler/tupleTypes.ts(15,1): error TS2322: Type '[number]' is not assignable to type '[number, string]'.
-  Property '1' is missing in type '[number]'.
+  Property '1' is missing in type [number]' but present in type '[number, string]'.
 tests/cases/compiler/tupleTypes.ts(17,6): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/tupleTypes.ts(17,15): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/tupleTypes.ts(18,1): error TS2322: Type '[number, string, number]' is not assignable to type '[number, string]'.
@@ -45,11 +45,11 @@ tests/cases/compiler/tupleTypes.ts(51,1): error TS2322: Type '[number, {}]' is n
     t = [];               // Error
     ~
 !!! error TS2322: Type '[]' is not assignable to type '[number, string]'.
-!!! error TS2322:   Property '0' is missing in type '[]'.
+!!! error TS2322:   Type '[]' is missing the following properties from type '[number, string]': 0, 1
     t = [1];              // Error
     ~
 !!! error TS2322: Type '[number]' is not assignable to type '[number, string]'.
-!!! error TS2322:   Property '1' is missing in type '[number]'.
+!!! error TS2322:   Property '1' is missing in type [number]' but present in type '[number, string]'.
     t = [1, "hello"];     // Ok
     t = ["hello", 1];     // Error
          ~~~~~~~
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
index eb74ff0ade003..f4601baa60dcc 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression2.ts(6,5): error TS2345: Argument of type 'typeof (Anonymous class)' is not assignable to parameter of type 'typeof (Anonymous class)'.
-  Type '(Anonymous class)' is not assignable to type 'foo<{}>.(Anonymous class)'.
-    Property 'prop' is missing in type '(Anonymous class)'.
+  Property 'prop' is missing in type (Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
 
 
 ==== tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression2.ts (1 errors) ====
@@ -12,5 +11,4 @@ tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpre
     foo(class { static prop = "hello" }).length;
         ~~~~~
 !!! error TS2345: Argument of type 'typeof (Anonymous class)' is not assignable to parameter of type 'typeof (Anonymous class)'.
-!!! error TS2345:   Type '(Anonymous class)' is not assignable to type 'foo<{}>.(Anonymous class)'.
-!!! error TS2345:     Property 'prop' is missing in type '(Anonymous class)'.
\ No newline at end of file
+!!! error TS2345:   Property 'prop' is missing in type (Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
index 3f3625fad1623..b9e1dd3587835 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2345: Argument of type 'Elephant' is not assignable to parameter of type 'Giraffe'.
-  Property 'y' is missing in type 'Elephant'.
+tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2737: Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
 
 
 ==== tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts (1 errors) ====
@@ -11,5 +10,4 @@ tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): er
     var e: Elephant;
     f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
          ~
-!!! error TS2345: Argument of type 'Elephant' is not assignable to parameter of type 'Giraffe'.
-!!! error TS2345:   Property 'y' is missing in type 'Elephant'.
\ No newline at end of file
+!!! error TS2737: Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index ad6065b0755c7..f1fe065d216d3 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -1,12 +1,8 @@
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(5,9): error TS2558: Expected 0 type arguments, but got 1.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'p' is missing in type 'SomeOther'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'x' is missing in type 'SomeOther'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'q' is missing in type 'SomeDerived'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'q' is missing in type 'SomeBase'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2735: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,5): error TS2304: Cannot find name 'numOrStr'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS1005: '>' expected.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS2304: Cannot find name 'is'.
@@ -58,24 +54,20 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     someBase = <SomeBase>someBase;
     someBase = <SomeBase>someOther; // Error
                ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'p' is missing in type 'SomeOther'.
+!!! error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
     
     someDerived = <SomeDerived>someDerived;
     someDerived = <SomeDerived>someBase;
     someDerived = <SomeDerived>someOther; // Error
                   ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'x' is missing in type 'SomeOther'.
+!!! error TS2735: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
     
     someOther = <SomeOther>someDerived; // Error
                 ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'q' is missing in type 'SomeDerived'.
+!!! error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
     someOther = <SomeOther>someBase; // Error
                 ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'q' is missing in type 'SomeBase'.
+!!! error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
     someOther = <SomeOther>someOther;
     
     // Type assertion cannot be a type-predicate type
diff --git a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
index 16a2a726915ef..0bee9c9aab888 100644
--- a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
+++ b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts(17,9): error TS2352: Conversion of type 'I2' to type 'I1 & I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Type 'I2' is not comparable to type 'I3'.
-    Property 'p3' is missing in type 'I2'.
+  Property 'p3' is missing in type I2' but present in type 'I3'.
 tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts(18,9): error TS2352: Conversion of type 'I2' to type 'I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 
 
@@ -24,8 +23,7 @@ tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithInt
     var a = <I1 & I3>z;
             ~~~~~~~~~~
 !!! error TS2352: Conversion of type 'I2' to type 'I1 & I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Type 'I2' is not comparable to type 'I3'.
-!!! error TS2352:     Property 'p3' is missing in type 'I2'.
+!!! error TS2352:   Property 'p3' is missing in type I2' but present in type 'I3'.
     var b = <I3>z;
             ~~~~~
 !!! error TS2352: Conversion of type 'I2' to type 'I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
index 13374b71236ce..4ed2aeacd96fb 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
@@ -12,7 +12,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(31,1):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(33,38): error TS1225: Cannot find parameter 'x'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(37,51): error TS2677: A type predicate's type must be assignable to its parameter's type.
   Type 'B' is not assignable to type 'A'.
-    Property 'propA' is missing in type 'B'.
+    Property 'propA' is missing in type B' but present in type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(41,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
   Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(45,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
@@ -22,8 +22,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(64,7):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(69,7): error TS2551: Property 'propB' does not exist on type 'A'. Did you mean 'propA'?
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(74,46): error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'.
   Type predicate 'p1 is C' is not assignable to 'p1 is B'.
-    Type 'C' is not assignable to type 'B'.
-      Property 'propB' is missing in type 'C'.
+    Property 'propB' is missing in type C' but present in type 'B'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(78,1): error TS2322: Type '(p1: any, p2: any) => boolean' is not assignable to type '(p1: any, p2: any) => p1 is A'.
   Signature '(p1: any, p2: any): boolean' must be a type predicate.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(84,1): error TS2322: Type '(p1: any, p2: any) => p2 is A' is not assignable to type '(p1: any, p2: any) => p1 is A'.
@@ -135,7 +134,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
                                                       ~
 !!! error TS2677: A type predicate's type must be assignable to its parameter's type.
 !!! error TS2677:   Type 'B' is not assignable to type 'A'.
-!!! error TS2677:     Property 'propA' is missing in type 'B'.
+!!! error TS2677:     Property 'propA' is missing in type B' but present in type 'A'.
         return true;
     }
     
@@ -191,8 +190,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
                                                  ~~~
 !!! error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'.
 !!! error TS2345:   Type predicate 'p1 is C' is not assignable to 'p1 is B'.
-!!! error TS2345:     Type 'C' is not assignable to type 'B'.
-!!! error TS2345:       Property 'propB' is missing in type 'C'.
+!!! error TS2345:     Property 'propB' is missing in type C' but present in type 'B'.
     
     // Boolean not assignable to type guard
     var assign1: (p1, p2) => p1 is A;
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
index 9f9f5d6533cab..653a5e93e30f8 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(23,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
-      Property 'follow' is missing in type 'LeadGuard'.
+      Property 'follow' is missing in type LeadGuard' but present in type 'FollowerGuard'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(24,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
     Type 'FollowerGuard' is not assignable to type 'LeadGuard'.
-      Property 'lead' is missing in type 'FollowerGuard'.
+      Property 'lead' is missing in type FollowerGuard' but present in type 'LeadGuard'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(26,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
@@ -45,13 +45,13 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors
 !!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
 !!! error TS2322:   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
 !!! error TS2322:     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
-!!! error TS2322:       Property 'follow' is missing in type 'LeadGuard'.
+!!! error TS2322:       Property 'follow' is missing in type LeadGuard' but present in type 'FollowerGuard'.
     b.isLeader = b.isFollower;
     ~~~~~~~~~~
 !!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
 !!! error TS2322:   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
 !!! error TS2322:     Type 'FollowerGuard' is not assignable to type 'LeadGuard'.
-!!! error TS2322:       Property 'lead' is missing in type 'FollowerGuard'.
+!!! error TS2322:       Property 'lead' is missing in type FollowerGuard' but present in type 'LeadGuard'.
     
     a.isFollower = a.isLeader;
     ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/typeMatch1.errors.txt b/tests/baselines/reference/typeMatch1.errors.txt
index 10a07397f7199..3b038023a3c05 100644
--- a/tests/baselines/reference/typeMatch1.errors.txt
+++ b/tests/baselines/reference/typeMatch1.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/typeMatch1.ts(18,1): error TS2322: Type 'D' is not assignable to type 'C'.
   Types have separate declarations of a private property 'x'.
 tests/cases/compiler/typeMatch1.ts(19,4): error TS2322: Type 'typeof C' is not assignable to type 'C'.
-  Property 'x' is missing in type 'typeof C'.
+  Property 'x' is missing in type typeof C' but present in type 'C'.
 tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will always return 'false' since the types 'typeof C' and 'typeof D' have no overlap.
 
 
@@ -30,7 +30,7 @@ tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will alwa
     x6=C;
        ~
 !!! error TS2322: Type 'typeof C' is not assignable to type 'C'.
-!!! error TS2322:   Property 'x' is missing in type 'typeof C'.
+!!! error TS2322:   Property 'x' is missing in type typeof C' but present in type 'C'.
 !!! related TS6213 tests/cases/compiler/typeMatch1.ts:19:4: Did you mean to use 'new' with this expression?
     C==D;
     ~~~~
diff --git a/tests/baselines/reference/typeMatch2.errors.txt b/tests/baselines/reference/typeMatch2.errors.txt
index 19ac6def2a9e7..d60d90f3a49f5 100644
--- a/tests/baselines/reference/typeMatch2.errors.txt
+++ b/tests/baselines/reference/typeMatch2.errors.txt
@@ -1,21 +1,21 @@
 tests/cases/compiler/typeMatch2.ts(3,2): error TS2322: Type '{}' is not assignable to type '{ x: number; y: number; }'.
-  Property 'x' is missing in type '{}'.
+  Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
 tests/cases/compiler/typeMatch2.ts(4,5): error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-  Property 'y' is missing in type '{ x: number; }'.
+  Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(5,20): error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(6,17): error TS2322: Type '{ x: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(18,5): error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
   Type 'Animal' is not assignable to type 'Giraffe'.
-    Property 'g' is missing in type 'Animal'.
+    Property 'g' is missing in type Animal' but present in type 'Giraffe'.
 tests/cases/compiler/typeMatch2.ts(22,5): error TS2322: Type '{ f1: number; f2: Animal[]; }' is not assignable to type '{ f1: number; f2: Giraffe[]; }'.
   Types of property 'f2' are incompatible.
     Type 'Animal[]' is not assignable to type 'Giraffe[]'.
 tests/cases/compiler/typeMatch2.ts(34,26): error TS2322: Type '{ x: number; y: any; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-  Property 'y' is missing in type '{ x: number; }'.
+  Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
 
 
 ==== tests/cases/compiler/typeMatch2.ts (8 errors) ====
@@ -24,11 +24,11 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
     	a = {}; // error
     	~
 !!! error TS2322: Type '{}' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'x' is missing in type '{}'.
+!!! error TS2322:   Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
         a = { x: 1 }; // error
         ~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'y' is missing in type '{ x: number; }'.
+!!! error TS2322:   Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
     	a = { x: 1, y: 2, z: 3 };
     	                  ~~~~
 !!! error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
@@ -52,7 +52,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
         ~~
 !!! error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
 !!! error TS2322:   Type 'Animal' is not assignable to type 'Giraffe'.
-!!! error TS2322:     Property 'g' is missing in type 'Animal'.
+!!! error TS2322:     Property 'g' is missing in type Animal' but present in type 'Giraffe'.
         var xa = { f1: 5, f2: aa };
         var xb = { f1: 5, f2: gg };
         xa = xb; // Should be ok
@@ -79,7 +79,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
         a = { x: 1 }; // error
         ~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'y' is missing in type '{ x: number; }'.
+!!! error TS2322:   Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
         var mf = function m(n) { return false; };
         var zf = function z(n: number) { return true; };
         mf=zf;
diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
index 9b385964c716d..6a882a9d902c3 100644
--- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
+++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
@@ -1,19 +1,14 @@
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
-  Property 'a' is missing in type '{ b: string; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(13,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
-  Property 'a' is missing in type '{ b: string; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(15,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
-  Property 'b' is missing in type '{ a: string; }'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
-  Property 'b' is missing in type '{ a: string; }'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
-  Property 'b' is missing in type 'I1'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2737: Property 'b' is missing in type I1' but present in type 'I2'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
 
 
@@ -31,8 +26,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     // Below should be in error
     var x1: A<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
-!!! error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
-!!! error TS2344:   Property 'a' is missing in type '{ b: string; }'.
+!!! error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
     var x2: A<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
 !!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
@@ -40,8 +34,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
 !!! error TS2344:     Type 'number' is not assignable to type 'string'.
     var x3: B<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
-!!! error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
-!!! error TS2344:   Property 'a' is missing in type '{ b: string; }'.
+!!! error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
     var x4: B<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
 !!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
@@ -49,12 +42,10 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
 !!! error TS2344:     Type 'number' is not assignable to type 'string'.
     var x5: A<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
-!!! error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
-!!! error TS2344:   Property 'b' is missing in type '{ a: string; }'.
+!!! error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
     var x6: B<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
-!!! error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
-!!! error TS2344:   Property 'b' is missing in type '{ a: string; }'.
+!!! error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
     
     interface I1 {
         a: string;
@@ -67,8 +58,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     
     var x7: A<I2, I1>;
                   ~~
-!!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
-!!! error TS2344:   Property 'b' is missing in type 'I1'.
+!!! error TS2737: Property 'b' is missing in type I1' but present in type 'I2'.
     var x8: B<I2, I1>;
                   ~~
 !!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
index e2551020f84ae..509115ce59783 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'b' is missing in type 'A'.
+  Property 'b' is missing in type A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts (1 errors) ====
@@ -12,5 +12,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30):
     var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
                                  ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'b' is missing in type 'A'.
+!!! error TS2322:   Property 'b' is missing in type A' but present in type 'B'.
 !!! 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 d678fb7f908b9..bb01ad4559043 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'b' is missing in type 'A'.
+  Property 'b' is missing in type A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts (1 errors) ====
@@ -12,5 +12,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35):
     var d = f(a, b, u2 => u2.b, t2 => t2);
                                       ~~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'b' is missing in type 'A'.
+!!! error TS2322:   Property 'b' is missing in type A' but present in type 'B'.
 !!! 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/typeRelationships.errors.txt b/tests/baselines/reference/typeRelationships.errors.txt
index 3795441577819..d79df69b458c7 100644
--- a/tests/baselines/reference/typeRelationships.errors.txt
+++ b/tests/baselines/reference/typeRelationships.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/thisType/typeRelationships.ts(9,9): error TS2322: Type 'C' is not assignable to type 'this'.
 tests/cases/conformance/types/thisType/typeRelationships.ts(35,9): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'self1' is missing in type 'C'.
+  Type 'C' is missing the following properties from type 'D': self1, self2, self3, d, bar
 tests/cases/conformance/types/thisType/typeRelationships.ts(36,9): error TS2322: Type 'D' is not assignable to type 'this'.
 
 
@@ -44,7 +44,7 @@ tests/cases/conformance/types/thisType/typeRelationships.ts(36,9): error TS2322:
             this.d = this.c;  // Error
             ~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'self1' is missing in type 'C'.
+!!! error TS2322:   Type 'C' is missing the following properties from type 'D': self1, self2, self3, d, bar
             this.self = this.d;  // Error
             ~~~~~~~~~
 !!! error TS2322: Type 'D' is not assignable to type 'this'.
diff --git a/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
index afd2e274317d4..fef4faf19117f 100644
--- a/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
+++ b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
@@ -1,8 +1,6 @@
-tests/cases/conformance/jsdoc/a.js(12,23): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
-  Property 'b' is missing in type '{ a: number; }'.
+tests/cases/conformance/jsdoc/a.js(12,23): error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
 tests/cases/conformance/jsdoc/a.js(15,12): error TS2314: Generic type 'Everything' requires 5 type argument(s).
-tests/cases/conformance/jsdoc/test.ts(1,34): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
-  Property 'b' is missing in type '{ a: number; }'.
+tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
 
 
 ==== tests/cases/conformance/jsdoc/a.js (2 errors) ====
@@ -19,8 +17,7 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2344: Type '{ a: number; }'
     
     /** @type {Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>} */
                           ~~~~~~~~~~~~~~
-!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
-!!! error TS2344:   Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
     var wrong;
     
     /** @type {Everything<{ a: number  }>} */
@@ -31,6 +28,5 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2344: Type '{ a: number; }'
 ==== tests/cases/conformance/jsdoc/test.ts (1 errors) ====
     declare var actually: Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>;
                                      ~~~~~~~~~~~~~~
-!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
-!!! error TS2344:   Property 'b' is missing in type '{ a: number; }'.
+!!! error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
index a3f8266dd8af3..2bacf93fbe117 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/typeofAmbientExternalModules_2.ts(7,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-  Property 'C' is missing in type 'typeof D'.
+  Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
 tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+  Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
 
 
 ==== tests/cases/compiler/typeofAmbientExternalModules_2.ts (2 errors) ====
@@ -14,12 +14,12 @@ tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type
     y1 = exp;
     ~~
 !!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-!!! error TS2322:   Property 'C' is missing in type 'typeof D'.
+!!! error TS2322:   Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
 !!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+!!! error TS2322:   Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
 ==== tests/cases/compiler/typeofAmbientExternalModules_0.ts (0 errors) ====
     export class C { foo: string; }
     
diff --git a/tests/baselines/reference/typeofExternalModules.errors.txt b/tests/baselines/reference/typeofExternalModules.errors.txt
index 46b9d49d900b5..7cd5e2b856c6c 100644
--- a/tests/baselines/reference/typeofExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofExternalModules.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/typeofExternalModules_core.ts(5,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-  Property 'C' is missing in type 'typeof D'.
+  Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
 tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+  Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
 
 
 ==== tests/cases/compiler/typeofExternalModules_core.ts (2 errors) ====
@@ -12,12 +12,12 @@ tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typ
     y1 = exp;
     ~~
 !!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-!!! error TS2322:   Property 'C' is missing in type 'typeof D'.
+!!! error TS2322:   Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
 !!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+!!! error TS2322:   Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
 ==== tests/cases/compiler/typeofExternalModules_external.ts (0 errors) ====
     export class C { }
     
diff --git a/tests/baselines/reference/typeofInternalModules.errors.txt b/tests/baselines/reference/typeofInternalModules.errors.txt
index ca8fe501c949c..8268c5e684aa9 100644
--- a/tests/baselines/reference/typeofInternalModules.errors.txt
+++ b/tests/baselines/reference/typeofInternalModules.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/typeofInternalModules.ts(15,16): error TS2708: Cannot use namespace 'importUninst' as a value.
 tests/cases/compiler/typeofInternalModules.ts(17,9): error TS2709: Cannot use namespace 'Outer' as a type.
 tests/cases/compiler/typeofInternalModules.ts(19,1): error TS2322: Type 'typeof Outer' is not assignable to type 'typeof instantiated'.
-  Property 'C' is missing in type 'typeof Outer'.
+  Property 'C' is missing in type typeof Outer' but present in type 'typeof instantiated'.
 tests/cases/compiler/typeofInternalModules.ts(21,16): error TS2708: Cannot use namespace 'importUninst' as a value.
 tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof instantiated' is not assignable to type 'typeof Outer'.
-  Property 'instantiated' is missing in type 'typeof instantiated'.
+  Property 'instantiated' is missing in type typeof instantiated' but present in type 'typeof Outer'.
 
 
 ==== tests/cases/compiler/typeofInternalModules.ts (5 errors) ====
@@ -33,7 +33,7 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof
     x5 = Outer;
     ~~
 !!! error TS2322: Type 'typeof Outer' is not assignable to type 'typeof instantiated'.
-!!! error TS2322:   Property 'C' is missing in type 'typeof Outer'.
+!!! error TS2322:   Property 'C' is missing in type typeof Outer' but present in type 'typeof instantiated'.
     x5 = Outer.instantiated;
     var x6: typeof importUninst;
                    ~~~~~~~~~~~~
@@ -42,5 +42,5 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof
     x7 = importInst;
     ~~
 !!! error TS2322: Type 'typeof instantiated' is not assignable to type 'typeof Outer'.
-!!! error TS2322:   Property 'instantiated' is missing in type 'typeof instantiated'.
+!!! error TS2322:   Property 'instantiated' is missing in type typeof instantiated' but present in type 'typeof Outer'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
index 3d28ddb505a14..72ba1bd5abc58 100644
--- a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
+++ b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
@@ -37,14 +37,14 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(59,12): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(62,12): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(64,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'IterableIterator<number>'.
-  Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>'.
+  Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(67,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterable<number>'.
-  Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>'.
+  Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(70,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterator<number>'.
   Types of property 'next' are incompatible.
     Type '(value?: any) => Promise<IteratorResult<any>>' is not assignable to type '(value?: any) => IteratorResult<number>'.
       Type 'Promise<IteratorResult<any>>' is not assignable to type 'IteratorResult<number>'.
-        Property 'done' is missing in type 'Promise<IteratorResult<any>>'.
+        Type 'Promise<IteratorResult<any>>' is missing the following properties from type 'IteratorResult<number>': done, value
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(74,12): error TS2504: Type '{}' must have a '[Symbol.asyncIterator]()' method that returns an async iterator.
 
 
@@ -173,13 +173,13 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
     async function * explicitReturnType10(): IterableIterator<number> {
                                              ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'IterableIterator<number>'.
-!!! error TS2322:   Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>'.
+!!! error TS2322:   Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
         yield 1;
     }
     async function * explicitReturnType11(): Iterable<number> {
                                              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterable<number>'.
-!!! error TS2322:   Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>'.
+!!! error TS2322:   Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
         yield 1;
     }
     async function * explicitReturnType12(): Iterator<number> {
@@ -188,7 +188,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
 !!! error TS2322:   Types of property 'next' are incompatible.
 !!! error TS2322:     Type '(value?: any) => Promise<IteratorResult<any>>' is not assignable to type '(value?: any) => IteratorResult<number>'.
 !!! error TS2322:       Type 'Promise<IteratorResult<any>>' is not assignable to type 'IteratorResult<number>'.
-!!! error TS2322:         Property 'done' is missing in type 'Promise<IteratorResult<any>>'.
+!!! error TS2322:         Type 'Promise<IteratorResult<any>>' is missing the following properties from type 'IteratorResult<number>': done, value
         yield 1;
     }
     async function * yieldStar() {
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
index 6f8a0e185954a..0cbe54b4f529b 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
-  Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")'.
+  Property 'M2' is missing in type typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
 
 
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeo
     var y: {M2: Object} = foo0;
         ~
 !!! error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
-!!! error TS2322:   Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")'.
+!!! error TS2322:   Property 'M2' is missing in type typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
     
 ==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
     export interface Person {
diff --git a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
index f5d3584501c96..f13cc542c2560 100644
--- a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
+++ b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
@@ -1,15 +1,15 @@
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(25,1): error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
     Type 'Foo' is not assignable to type 'Bar'.
-      Property 'bar' is missing in type 'Foo'.
+      Property 'bar' is missing in type Foo' but present in type 'Bar'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(26,1): error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
     Type 'Foo' is not assignable to type 'Baz'.
-      Property 'baz' is missing in type 'Foo'.
+      Property 'baz' is missing in type Foo' but present in type 'Baz'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(27,1): error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
     Type 'Foo' is not assignable to type 'Kwah'.
-      Property 'kwah' is missing in type 'Foo'.
+      Property 'kwah' is missing in type Foo' but present in type 'Kwah'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(48,1): error TS2322: Type 'X<Foo>' is not assignable to type 'X<Bar> | Y<Baz> | Z<Kwah>'.
   Type 'X<Foo>' is not assignable to type 'X<Bar>'.
     Types of property 'xProp' are incompatible.
@@ -54,19 +54,19 @@ tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(50,1): error TS2322: Typ
 !!! error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
 !!! error TS2322:     Type 'Foo' is not assignable to type 'Bar'.
-!!! error TS2322:       Property 'bar' is missing in type 'Foo'.
+!!! error TS2322:       Property 'bar' is missing in type Foo' but present in type 'Bar'.
     thingOfInterfaces = b;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
 !!! error TS2322:     Type 'Foo' is not assignable to type 'Baz'.
-!!! error TS2322:       Property 'baz' is missing in type 'Foo'.
+!!! error TS2322:       Property 'baz' is missing in type Foo' but present in type 'Baz'.
     thingOfInterfaces = c;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
 !!! error TS2322:     Type 'Foo' is not assignable to type 'Kwah'.
-!!! error TS2322:       Property 'kwah' is missing in type 'Foo'.
+!!! error TS2322:       Property 'kwah' is missing in type Foo' but present in type 'Kwah'.
     
     ////////
     
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
index d481b88810caf..2608183efb410 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
@@ -2,12 +2,12 @@ tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(19,1): error TS2
   Types of property 'parent' are incompatible.
     Type 'Module | Class' is not assignable to type 'Namespace'.
       Type 'Class' is not assignable to type 'Namespace'.
-        Property 'members' is missing in type 'Class'.
+        Property 'members' is missing in type Class' but present in type 'Namespace'.
 tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2322: Type 'Class' is not assignable to type 'Property'.
   Types of property 'parent' are incompatible.
     Type 'Namespace' is not assignable to type 'Module | Class'.
       Type 'Namespace' is not assignable to type 'Class'.
-        Property 'parent' is missing in type 'Namespace'.
+        Property 'parent' is missing in type Namespace' but present in type 'Class'.
 
 
 ==== tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts (2 errors) ====
@@ -35,12 +35,12 @@ tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Module | Class' is not assignable to type 'Namespace'.
 !!! error TS2322:       Type 'Class' is not assignable to type 'Namespace'.
-!!! error TS2322:         Property 'members' is missing in type 'Class'.
+!!! error TS2322:         Property 'members' is missing in type Class' but present in type 'Namespace'.
     p = c;
     ~
 !!! error TS2322: Type 'Class' is not assignable to type 'Property'.
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Namespace' is not assignable to type 'Module | Class'.
 !!! error TS2322:       Type 'Namespace' is not assignable to type 'Class'.
-!!! error TS2322:         Property 'parent' is missing in type 'Namespace'.
+!!! error TS2322:         Property 'parent' is missing in type Namespace' but present in type 'Class'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypesAssignability.errors.txt b/tests/baselines/reference/unionTypesAssignability.errors.txt
index 7397105d317af..23b5a00b0c762 100644
--- a/tests/baselines/reference/unionTypesAssignability.errors.txt
+++ b/tests/baselines/reference/unionTypesAssignability.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(18,1): error TS2322: Type 'E' is not assignable to type 'D'.
-  Property 'foo1' is missing in type 'E'.
+  Property 'foo1' is missing in type E' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(19,1): error TS2322: Type 'D | E' is not assignable to type 'D'.
   Type 'E' is not assignable to type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(20,1): error TS2322: Type 'D' is not assignable to type 'E'.
-  Property 'foo2' is missing in type 'D'.
+  Property 'foo2' is missing in type D' but present in type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(22,1): error TS2322: Type 'D | E' is not assignable to type 'E'.
   Type 'D' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(24,1): error TS2322: Type 'string' is not assignable to type 'number'.
@@ -13,9 +13,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(28,1): error TS2322: Type 'string | number' is not assignable to type 'string'.
   Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(31,1): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'foo1' is missing in type 'C'.
+  Property 'foo1' is missing in type C' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(32,1): error TS2322: Type 'C' is not assignable to type 'E'.
-  Property 'foo2' is missing in type 'C'.
+  Property 'foo2' is missing in type C' but present in type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(33,1): error TS2322: Type 'C' is not assignable to type 'D | E'.
   Type 'C' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(35,1): error TS2322: Type 'D' is not assignable to type 'E'.
@@ -51,7 +51,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = e;
     ~
 !!! error TS2322: Type 'E' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo1' is missing in type 'E'.
+!!! error TS2322:   Property 'foo1' is missing in type E' but present in type 'D'.
     d = unionDE; // error e is not assignable to d
     ~
 !!! error TS2322: Type 'D | E' is not assignable to type 'D'.
@@ -59,7 +59,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     e = d;
     ~
 !!! error TS2322: Type 'D' is not assignable to type 'E'.
-!!! error TS2322:   Property 'foo2' is missing in type 'D'.
+!!! error TS2322:   Property 'foo2' is missing in type D' but present in type 'E'.
     e = e;
     e = unionDE; // error d is not assignable to e
     ~
@@ -86,11 +86,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = c;
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo1' is missing in type 'C'.
+!!! error TS2322:   Property 'foo1' is missing in type C' but present in type 'D'.
     e = c;
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'E'.
-!!! error TS2322:   Property 'foo2' is missing in type 'C'.
+!!! error TS2322:   Property 'foo2' is missing in type C' but present in type 'E'.
     unionDE = c; // error since C is not assinable to either D or E
     ~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D | E'.
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt
index d1a1b0f08f94d..e7f5fc99136bd 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(3,12): error TS2
 tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(5,10): error TS2347: Untyped function calls may not accept type arguments.
 tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(8,10): error TS2347: Untyped function calls may not accept type arguments.
 tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(10,7): error TS2420: Class 'C' incorrectly implements interface 'Function'.
-  Property 'apply' is missing in type 'C'.
+  Type 'C' is missing the following properties from type 'Function': apply, call, bind
 tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(18,10): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'C' has no compatible call signatures.
 tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(22,10): error TS2347: Untyped function calls may not accept type arguments.
 tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(28,12): error TS2558: Expected 0 type arguments, but got 1.
@@ -29,7 +29,7 @@ tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts(41,4): error TS2
     class C implements Function {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'Function'.
-!!! error TS2420:   Property 'apply' is missing in type 'C'.
+!!! error TS2420:   Type 'C' is missing the following properties from type 'Function': apply, call, bind
         prototype = null;
         length = 1;
         arguments = null;

From d84c22dfc75eda9afd8f7f5e36400479d7440a03 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 1 Nov 2018 15:50:59 -0700
Subject: [PATCH 2/6] Add missing quote

---
 src/compiler/diagnosticMessages.json          |   2 +-
 .../arityAndOrderCompatibility01.errors.txt   |  16 +--
 .../reference/arrayAssignmentTest1.errors.txt |  32 ++---
 .../reference/arrayAssignmentTest2.errors.txt |  12 +-
 .../reference/arrayAssignmentTest5.errors.txt |   4 +-
 .../baselines/reference/arrayFrom.errors.txt  |   4 +-
 ...typeIsAssignableToReadonlyArray.errors.txt |   4 +-
 ...ambdaToNominalSubtypeOfFunction.errors.txt |   8 +-
 .../reference/assignmentCompat1.errors.txt    |   8 +-
 ...nmentCompatBetweenTupleAndArray.errors.txt |   4 +-
 .../reference/assignmentCompatBug2.errors.txt |  12 +-
 ...CompatFunctionsWithOptionalArgs.errors.txt |   4 +-
 ...gnmentCompatWithCallSignatures2.errors.txt |  32 ++---
 ...gnmentCompatWithCallSignatures3.errors.txt |   4 +-
 ...tCompatWithConstructSignatures2.errors.txt |  32 ++---
 ...tCompatWithConstructSignatures3.errors.txt |   4 +-
 ...ignmentCompatWithNumericIndexer.errors.txt |   4 +-
 ...gnmentCompatWithNumericIndexer2.errors.txt |   4 +-
 ...gnmentCompatWithNumericIndexer3.errors.txt |   8 +-
 ...ignmentCompatWithObjectMembers4.errors.txt |  12 +-
 ...ignmentCompatWithObjectMembers5.errors.txt |   8 +-
 ...atWithObjectMembersOptionality2.errors.txt |  36 +++---
 ...ObjectMembersStringNumericNames.errors.txt | 116 +++++++++---------
 ...signmentCompatWithStringIndexer.errors.txt |   4 +-
 ...ignmentCompatWithStringIndexer2.errors.txt |   4 +-
 ...ember-off-of-function-interface.errors.txt |  12 +-
 ...ember-off-of-function-interface.errors.txt |  12 +-
 tests/baselines/reference/bases.errors.txt    |   4 +-
 .../reference/bluebirdStaticThis.errors.txt   |   4 +-
 .../reference/castingTuple.errors.txt         |  12 +-
 .../reference/chainedAssignment1.errors.txt   |   4 +-
 .../reference/chainedAssignment3.errors.txt   |   4 +-
 .../chainedAssignmentChecking.errors.txt      |   4 +-
 ...ConstrainedToOtherTypeParameter.errors.txt |   4 +-
 .../reference/checkJsdocTypeTag6.errors.txt   |   4 +-
 .../checkJsxChildrenProperty2.errors.txt      |   4 +-
 .../checkJsxChildrenProperty5.errors.txt      |   4 +-
 ...assCanExtendConstructorFunction.errors.txt |   4 +-
 .../classImplementsClass2.errors.txt          |   8 +-
 .../classImplementsClass4.errors.txt          |   8 +-
 .../classImplementsClass7.errors.txt          |   4 +-
 ...sImplementsMergedClassInterface.errors.txt |   8 +-
 .../clodulesDerivedClasses.errors.txt         |   4 +-
 ...onalOperatorWithoutIdenticalBCT.errors.txt |   8 +-
 .../reference/conditionalTypes2.errors.txt    |  12 +-
 .../reference/constraints0.errors.txt         |   4 +-
 ...atureInstatiationContravariance.errors.txt |   4 +-
 .../contextualTypeWithTuple.errors.txt        |  12 +-
 ...lTypeWithUnionTypeObjectLiteral.errors.txt |   4 +-
 .../reference/contextualTyping.errors.txt     |   4 +-
 .../reference/contextualTyping11.errors.txt   |   4 +-
 .../reference/contextualTyping5.errors.txt    |   4 +-
 .../reference/covariantCallbacks.errors.txt   |   4 +-
 ...ertyIsRelatableToTargetProperty.errors.txt |   4 +-
 .../declarationsAndAssignments.errors.txt     |   4 +-
 .../deeplyNestedAssignabilityIssue.errors.txt |   8 +-
 ...tructuringParameterDeclaration2.errors.txt |   8 +-
 ...cturingParameterDeclaration3ES5.errors.txt |   4 +-
 ...arameterDeclaration3ES5iterable.errors.txt |   4 +-
 ...cturingParameterDeclaration3ES6.errors.txt |   4 +-
 ...tructuringParameterDeclaration4.errors.txt |   4 +-
 ...tructuringParameterDeclaration5.errors.txt |   8 +-
 ...orExpressionsWhichCouldBeCalled.errors.txt |   4 +-
 .../differentTypesWithSameName.errors.txt     |   4 +-
 .../reference/elaboratedErrors.errors.txt     |   8 +-
 .../errorsWithInvokablesInUnions01.errors.txt |   4 +-
 ...AnnotationAndInvalidInitializer.errors.txt |  12 +-
 .../excessPropertyCheckWithUnions.errors.txt  |   4 +-
 .../exportDefaultStripsFreshness.errors.txt   |   8 +-
 ...fixingTypeParametersRepeatedly2.errors.txt |   4 +-
 tests/baselines/reference/for-of31.errors.txt |   4 +-
 .../reference/functionOverloads41.errors.txt  |   4 +-
 tests/baselines/reference/fuzzy.errors.txt    |   8 +-
 .../reference/generatorTypeCheck18.errors.txt |   4 +-
 .../reference/generatorTypeCheck20.errors.txt |   4 +-
 .../reference/generatorTypeCheck25.errors.txt |   4 +-
 .../reference/generatorTypeCheck7.errors.txt  |   4 +-
 ...thObjectTypeArgsAndConstraints3.errors.txt |   4 +-
 ...thObjectTypeArgsAndConstraints4.errors.txt |   4 +-
 ...thObjectTypeArgsAndConstraints5.errors.txt |   4 +-
 .../genericCallWithTupleType.errors.txt       |   4 +-
 .../reference/genericConstraint2.errors.txt   |   8 +-
 .../genericRestParameters2.errors.txt         |   4 +-
 .../genericRestParameters3.errors.txt         |  32 ++---
 .../genericTypeAssertions2.errors.txt         |   8 +-
 .../genericTypeConstraints.errors.txt         |   4 +-
 .../baselines/reference/generics1.errors.txt  |   4 +-
 .../baselines/reference/generics2.errors.txt  |   4 +-
 .../baselines/reference/generics5.errors.txt  |   4 +-
 ...rfaceExtendingClassWithPrivates.errors.txt |   4 +-
 ...faceExtendingClassWithPrivates2.errors.txt |  20 +--
 ...aceExtendingClassWithProtecteds.errors.txt |   8 +-
 ...tCallExpressionCheckReturntype1.errors.txt |   8 +-
 .../reference/inheritance1.errors.txt         |  48 ++++----
 ...sxFactoryDeclarationsLocalTypes.errors.txt |  12 +-
 ...xFactoryLocalTypeGlobalFallback.errors.txt |   4 +-
 .../interfaceAssignmentCompat.errors.txt      |   4 +-
 .../interfaceDeclaration1.errors.txt          |   4 +-
 .../interfaceDeclaration4.errors.txt          |   8 +-
 ...terfaceExtendsClassWithPrivate1.errors.txt |   8 +-
 .../interfaceImplementation2.errors.txt       |   4 +-
 .../interfaceImplementation3.errors.txt       |   4 +-
 .../interfaceImplementation4.errors.txt       |   4 +-
 .../interfaceImplementation6.errors.txt       |   4 +-
 .../intersectionAndUnionTypes.errors.txt      |  44 +++----
 .../intersectionTypeAssignment.errors.txt     |  16 +--
 .../invalidReturnStatements.errors.txt        |   4 +-
 .../iterableArrayPattern17.errors.txt         |   4 +-
 .../iteratorSpreadInArray9.errors.txt         |   4 +-
 .../reference/jsdocFunctionType.errors.txt    |   4 +-
 .../reference/jsdocTemplateTag3.errors.txt    |   4 +-
 .../reference/jsdocTypeTagCast.errors.txt     |  12 +-
 .../reference/mappedTypeErrors.errors.txt     |   4 +-
 .../reference/mappedTypes6.errors.txt         |   8 +-
 ...nterfacesWithInheritedPrivates2.errors.txt |   4 +-
 ...wingGenericTypeFromInstanceof01.errors.txt |   4 +-
 .../nonIterableRestElement3.errors.txt        |   4 +-
 .../nonPrimitiveAssignError.errors.txt        |   4 +-
 ...eralFunctionArgContextualTyping.errors.txt |   8 +-
 ...ralFunctionArgContextualTyping2.errors.txt |   4 +-
 .../objectLiteralIndexerErrors.errors.txt     |   4 +-
 .../objectLiteralNormalization.errors.txt     |   4 +-
 ...handPropertiesFunctionArgument2.errors.txt |   4 +-
 .../reference/objectSpreadNegative.errors.txt |   8 +-
 ...bjectTypesIdentityWithPrivates3.errors.txt |   4 +-
 .../optionalPropertiesInClasses.errors.txt    |   4 +-
 .../optionalPropertiesTest.errors.txt         |  12 +-
 .../overloadingOnConstants1.errors.txt        |  16 +--
 ...nWithConstraintCheckingDeferred.errors.txt |   8 +-
 .../overloadsWithProvisionalErrors.errors.txt |   4 +-
 .../reference/promisePermutations.errors.txt  |   4 +-
 .../reference/promisePermutations2.errors.txt |   4 +-
 .../reference/promisePermutations3.errors.txt |   8 +-
 .../promisesWithConstraints.errors.txt        |   4 +-
 tests/baselines/reference/qualify.errors.txt  |  12 +-
 .../recursiveClassReferenceTest.errors.txt    |   4 +-
 .../recursiveInheritance3.errors.txt          |   4 +-
 .../recursiveIntersectionTypes.errors.txt     |   4 +-
 .../requireOfJsonFileInJsFile.errors.txt      |   8 +-
 .../reference/restTupleElements1.errors.txt   |  16 +--
 .../restTuplesFromContextualTypes.errors.txt  |   4 +-
 ...cMemberOfAnotherClassAssignment.errors.txt |  16 +--
 .../reference/strictBindCallApply1.errors.txt |   4 +-
 .../strictFunctionTypesErrors.errors.txt      |   4 +-
 .../reference/strictTupleLength.errors.txt    |   4 +-
 ...ConstrainsPropertyDeclarations2.errors.txt |   8 +-
 .../subtypingWithNumericIndexer2.errors.txt   |   4 +-
 .../subtypingWithNumericIndexer3.errors.txt   |   4 +-
 .../subtypingWithNumericIndexer4.errors.txt   |   4 +-
 .../subtypingWithNumericIndexer5.errors.txt   |   4 +-
 .../subtypingWithObjectMembers3.errors.txt    |   4 +-
 .../subtypingWithObjectMembers5.errors.txt    |  12 +-
 .../subtypingWithStringIndexer2.errors.txt    |   4 +-
 .../subtypingWithStringIndexer3.errors.txt    |   4 +-
 .../subtypingWithStringIndexer4.errors.txt    |   4 +-
 .../reference/symbolProperty10.errors.txt     |   4 +-
 .../reference/symbolProperty25.errors.txt     |   4 +-
 .../reference/symbolProperty52.errors.txt     |   4 +-
 .../reference/symbolProperty9.errors.txt      |   4 +-
 ...eStringsWithOverloadResolution1.errors.txt |   4 +-
 ...ingsWithOverloadResolution1_ES6.errors.txt |   4 +-
 .../thisTypeInFunctionsNegative.errors.txt    |  12 +-
 .../tsxAttributeResolution1.errors.txt        |   4 +-
 .../tsxAttributeResolution12.errors.txt       |   8 +-
 .../tsxAttributeResolution3.errors.txt        |   4 +-
 .../tsxAttributeResolution5.errors.txt        |   8 +-
 .../tsxAttributeResolution6.errors.txt        |   4 +-
 .../tsxInvokeComponentType.errors.txt         |   4 +-
 ...tsxSpreadAttributesResolution16.errors.txt |   4 +-
 .../tsxSpreadAttributesResolution6.errors.txt |   4 +-
 ...elessFunctionComponentOverload4.errors.txt |   8 +-
 ...tsxStatelessFunctionComponents1.errors.txt |   4 +-
 ...ionComponentsWithTypeArguments4.errors.txt |   8 +-
 .../reference/tsxUnionElementType6.errors.txt |   8 +-
 .../baselines/reference/tupleTypes.errors.txt |   4 +-
 ...ntInferenceWithClassExpression2.errors.txt |   4 +-
 ...renceWithConstraintAsCommonRoot.errors.txt |   4 +-
 .../reference/typeAssertions.errors.txt       |  12 +-
 ...sertionsWithIntersectionTypes01.errors.txt |   4 +-
 .../typeGuardFunctionErrors.errors.txt        |   8 +-
 ...peGuardFunctionOfFormThisErrors.errors.txt |   8 +-
 .../baselines/reference/typeMatch1.errors.txt |   4 +-
 .../baselines/reference/typeMatch2.errors.txt |  12 +-
 .../typeParamExtendsOtherTypeParam.errors.txt |  20 +--
 ...gWithContextSensitiveArguments2.errors.txt |   4 +-
 ...gWithContextSensitiveArguments3.errors.txt |   4 +-
 .../typedefMultipleTypeParameters.errors.txt  |   8 +-
 .../typeofAmbientExternalModules.errors.txt   |   8 +-
 .../typeofExternalModules.errors.txt          |   8 +-
 .../typeofInternalModules.errors.txt          |   8 +-
 .../types.asyncGenerators.esnext.2.errors.txt |   8 +-
 ...yExternalModuleStillHasInstance.errors.txt |   4 +-
 ...unionTypeErrorMessageTypeRefs01.errors.txt |  12 +-
 ...eWithRecursiveSubtypeReduction2.errors.txt |   8 +-
 .../unionTypesAssignability.errors.txt        |  16 +--
 195 files changed, 763 insertions(+), 763 deletions(-)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 2382119c66d4e..d9305a161a566 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2501,7 +2501,7 @@
         "category": "Error",
         "code": 2736
     },
-    "Property '{0}' is missing in type {1}' but present in type '{2}'.": {
+    "Property '{0}' is missing in type '{1}' but present in type '{2}'.": {
         "category": "Error",
         "code": 2737
     },
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
index 46540eab0c870..b150c53c6d2f7 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
@@ -3,15 +3,15 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,12): erro
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2461: Type '{ 0: string; 1: number; length: 2; }' is not an array type.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,12): error TS2460: Type '{ 0: string; 1: number; length: 2; }' has no property '2'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type [string, number]' but present in type '[number, number, number]'.
+  Property '2' is missing in type '[string, number]' but present in type '[number, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type StrNum' but present in type '[number, number, number]'.
+  Property '2' is missing in type 'StrNum' but present in type '[number, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type [string, number]' but present in type '[string, number, number]'.
+  Property '2' is missing in type '[string, number]' but present in type '[string, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type StrNum' but present in type '[string, number, number]'.
+  Property '2' is missing in type 'StrNum' but present in type '[string, number, number]'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '[string, number]' is not assignable to type '[number]'.
@@ -68,11 +68,11 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
     var j1: [number, number, number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type [string, number]' but present in type '[number, number, number]'.
+!!! error TS2322:   Property '2' is missing in type '[string, number]' but present in type '[number, number, number]'.
     var j2: [number, number, number] = y;
         ~~
 !!! error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type StrNum' but present in type '[number, number, number]'.
+!!! error TS2322:   Property '2' is missing in type 'StrNum' but present in type '[number, number, number]'.
     var j3: [number, number, number] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
@@ -80,11 +80,11 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
     var k1: [string, number, number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type [string, number]' but present in type '[string, number, number]'.
+!!! error TS2322:   Property '2' is missing in type '[string, number]' but present in type '[string, number, number]'.
     var k2: [string, number, number] = y;
         ~~
 !!! error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type StrNum' but present in type '[string, number, number]'.
+!!! error TS2322:   Property '2' is missing in type 'StrNum' but present in type '[string, number, number]'.
     var k3: [string, number, number] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
diff --git a/tests/baselines/reference/arrayAssignmentTest1.errors.txt b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
index d53156db918fb..2a018ae13d3b6 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
@@ -1,23 +1,23 @@
 tests/cases/compiler/arrayAssignmentTest1.ts(46,5): error TS2322: Type 'undefined[]' is not assignable to type 'I1'.
-  Property 'IM1' is missing in type undefined[]' but present in type 'I1'.
+  Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(47,5): error TS2322: Type 'undefined[]' is not assignable to type 'C1'.
   Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(48,5): error TS2322: Type 'undefined[]' is not assignable to type 'C2'.
   Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(49,5): error TS2322: Type 'undefined[]' is not assignable to type 'C3'.
-  Property 'CM3M1' is missing in type undefined[]' but present in type 'C3'.
+  Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(60,1): error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
   Type 'C3' is not assignable to type 'I1'.
-    Property 'IM1' is missing in type C3' but present in type 'I1'.
+    Property 'IM1' is missing in type 'C3' but present in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(64,1): error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
   Type 'I1' is not assignable to type 'C1'.
-    Property 'C1M1' is missing in type I1' but present in type 'C1'.
+    Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(65,1): error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
   Type 'C3' is not assignable to type 'C1'.
     Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(68,1): error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
   Type 'C1' is not assignable to type 'C2'.
-    Property 'C2M1' is missing in type C1' but present in type 'C2'.
+    Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
 tests/cases/compiler/arrayAssignmentTest1.ts(69,1): error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
   Type 'I1' is not assignable to type 'C2'.
     Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
@@ -26,13 +26,13 @@ tests/cases/compiler/arrayAssignmentTest1.ts(70,1): error TS2322: Type 'C3[]' is
     Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(75,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
   Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type C2' but present in type 'C3'.
+    Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(76,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
   Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type C1' but present in type 'C3'.
+    Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(77,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
   Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type I1' but present in type 'C3'.
+    Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(79,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
   Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
 tests/cases/compiler/arrayAssignmentTest1.ts(80,1): error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
@@ -96,7 +96,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     var i1_error: I1 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'I1'.
-!!! error TS2322:   Property 'IM1' is missing in type undefined[]' but present in type 'I1'.
+!!! error TS2322:   Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
     var c1_error: C1 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'C1'.
@@ -108,7 +108,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     var c3_error: C3 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2322: Type 'undefined[]' is not assignable to type 'C3'.
-!!! error TS2322:   Property 'CM3M1' is missing in type undefined[]' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
     
     
     arr_any = arr_i1; // should be ok - is
@@ -123,7 +123,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
 !!! error TS2322:   Type 'C3' is not assignable to type 'I1'.
-!!! error TS2322:     Property 'IM1' is missing in type C3' but present in type 'I1'.
+!!! error TS2322:     Property 'IM1' is missing in type 'C3' but present in type 'I1'.
     
     arr_c1 = arr_c1; // should be ok - subtype relationship - is
     arr_c1 = arr_c2; // should be ok - subtype relationship - is
@@ -131,7 +131,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C1'.
-!!! error TS2322:     Property 'C1M1' is missing in type I1' but present in type 'C1'.
+!!! error TS2322:     Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
     arr_c1 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
@@ -143,7 +143,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C2'.
-!!! error TS2322:     Property 'C2M1' is missing in type C1' but present in type 'C2'.
+!!! error TS2322:     Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
     arr_c2 = arr_i1; // should be an error - subtype relationship - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
@@ -162,17 +162,17 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type C2' but present in type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type C1' but present in type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type I1' but present in type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
diff --git a/tests/baselines/reference/arrayAssignmentTest2.errors.txt b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
index 2c90006648fbf..59dd4182e8592 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
@@ -1,12 +1,12 @@
 tests/cases/compiler/arrayAssignmentTest2.ts(47,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
   Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type C2' but present in type 'C3'.
+    Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(48,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
   Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type C1' but present in type 'C3'.
+    Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(49,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
   Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type I1' but present in type 'C3'.
+    Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(51,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
   Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
 tests/cases/compiler/arrayAssignmentTest2.ts(52,1): error TS2322: Type '() => any' is not assignable to type 'any[]'.
@@ -74,17 +74,17 @@ tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type C2' but present in type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type C1' but present in type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type I1' but present in type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
diff --git a/tests/baselines/reference/arrayAssignmentTest5.errors.txt b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
index 37d9b677af1ec..a8a1bfc599565 100644
--- a/tests/baselines/reference/arrayAssignmentTest5.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
   Type 'IToken' is not assignable to type 'IStateToken'.
-    Property 'state' is missing in type IToken' but present in type 'IStateToken'.
+    Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest5.ts (1 errors) ====
@@ -30,7 +30,7 @@ tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[
                     ~~~~~~
 !!! error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
 !!! error TS2322:   Type 'IToken' is not assignable to type 'IStateToken'.
-!!! error TS2322:     Property 'state' is missing in type IToken' but present in type 'IStateToken'.
+!!! error TS2322:     Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
                 if (tokens.length === 0) {
                     return this.onEnter(line, tokens, offset);        // <== this should produce an error since onEnter can not be called with (string, IStateToken[], offset)
                 }
diff --git a/tests/baselines/reference/arrayFrom.errors.txt b/tests/baselines/reference/arrayFrom.errors.txt
index ee4ecc36e8c76..34acb5b63177c 100644
--- a/tests/baselines/reference/arrayFrom.errors.txt
+++ b/tests/baselines/reference/arrayFrom.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/arrayFrom.ts(20,7): error TS2322: Type 'A[]' is not assignable to type 'B[]'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type A' but present in type 'B'.
+    Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assignable to type 'B[]'.
 
 
@@ -28,7 +28,7 @@ tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assigna
           ~~~~~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
     const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
     const result5: A[] = Array.from(inputALike);
     const result6: B[] = Array.from(inputALike); // expect error
diff --git a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
index 87bafe5889ee0..14c425977592e 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(13,1): error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type A' but present in type 'B'.
+    Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error TS2322: Type 'C<A>' is not assignable to type 'ReadonlyArray<B>'.
   Types of property 'concat' are incompatible.
     Type '{ (...items: ConcatArray<A>[]): A[]; (...items: (A | ConcatArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ConcatArray<B>[]): B[]; (...items: (B | ConcatArray<B>)[]): B[]; }'.
@@ -25,7 +25,7 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
     ~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
     
     rra = cra;
     rra = crb; // OK, C<B> is assignable to ReadonlyArray<A>
diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
index f9528bb0f7eb4..202ca7257aca0 100644
--- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
+++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(7,4): error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
-tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
+tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(7,4): error TS2737: Property 'x' is missing in type '(a: any, b: any) => boolean' but present in type 'IResultCallback'.
+tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS2737: Property 'x' is missing in type '(a: any, b: any) => boolean' but present in type 'IResultCallback'.
 
 
 ==== tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts (2 errors) ====
@@ -11,8 +11,8 @@ tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS273
     
     fn((a, b) => true);
        ~~~~~~~~~~~~~~
-!!! error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
+!!! error TS2737: Property 'x' is missing in type '(a: any, b: any) => boolean' but present in type 'IResultCallback'.
     fn(function (a, b) { return true; })
        ~~~~~~~~
-!!! error TS2737: Property 'x' is missing in type (a: any, b: any) => boolean' but present in type 'IResultCallback'.
+!!! error TS2737: Property 'x' is missing in type '(a: any, b: any) => boolean' but present in type 'IResultCallback'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompat1.errors.txt b/tests/baselines/reference/assignmentCompat1.errors.txt
index 5398b2509e8d6..d507b8bfdec11 100644
--- a/tests/baselines/reference/assignmentCompat1.errors.txt
+++ b/tests/baselines/reference/assignmentCompat1.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/assignmentCompat1.ts(4,1): error TS2322: Type '{ [index: string]: any; }' is not assignable to type '{ one: number; }'.
-  Property 'one' is missing in type { [index: string]: any; }' but present in type '{ one: number; }'.
+  Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
 tests/cases/compiler/assignmentCompat1.ts(6,1): error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
-  Property 'one' is missing in type { [index: number]: any; }' but present in type '{ one: number; }'.
+  Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
 tests/cases/compiler/assignmentCompat1.ts(8,1): error TS2322: Type '"foo"' is not assignable to type '{ [index: string]: any; }'.
 tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is not assignable to type '{ [index: number]: any; }'.
 
@@ -13,12 +13,12 @@ tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is n
     x = y;  // Error
     ~
 !!! error TS2322: Type '{ [index: string]: any; }' is not assignable to type '{ one: number; }'.
-!!! error TS2322:   Property 'one' is missing in type { [index: string]: any; }' but present in type '{ one: number; }'.
+!!! error TS2322:   Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
     y = x;  // Ok because index signature type is any
     x = z;  // Error
     ~
 !!! error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
-!!! error TS2322:   Property 'one' is missing in type { [index: number]: any; }' but present in type '{ one: number; }'.
+!!! error TS2322:   Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
     z = x;  // Ok because index signature type is any
     y = "foo"; // Error
     ~
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
index 15cbd2ea15824..d698826ca1e5a 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Type 'string | number' is not assignable to type 'number'.
     Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2322: Type '{}[]' is not assignable to type '[{}]'.
-  Property '0' is missing in type {}[]' but present in type '[{}]'.
+  Property '0' is missing in type '{}[]' but present in type '[{}]'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts (2 errors) ====
@@ -30,5 +30,5 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     emptyObjTuple = emptyObjArray;
     ~~~~~~~~~~~~~
 !!! error TS2322: Type '{}[]' is not assignable to type '[{}]'.
-!!! error TS2322:   Property '0' is missing in type {}[]' but present in type '[{}]'.
+!!! error TS2322:   Property '0' is missing in type '{}[]' but present in type '[{}]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatBug2.errors.txt b/tests/baselines/reference/assignmentCompatBug2.errors.txt
index 8b0ce8824b092..6f520fb39e9c7 100644
--- a/tests/baselines/reference/assignmentCompatBug2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBug2.errors.txt
@@ -5,11 +5,11 @@ tests/cases/compiler/assignmentCompatBug2.ts(3,8): error TS2322: Type '{ a: numb
 tests/cases/compiler/assignmentCompatBug2.ts(5,13): error TS2322: Type '{ b: number; a: number; }' is not assignable to type '{ b: number; }'.
   Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+  Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'g' is missing in type { f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+  Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+  Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 
 
 ==== tests/cases/compiler/assignmentCompatBug2.ts (6 errors) ====
@@ -39,7 +39,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     b3 = {
     ~~
 !!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! error TS2322:   Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
     }; // error
@@ -47,7 +47,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     b3 = {
     ~~
 !!! error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'g' is missing in type { f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! error TS2322:   Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         m: 0,
     }; // error
@@ -63,7 +63,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     b3 = {
     ~~
 !!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'm' is missing in type { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! error TS2322:   Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
         n: 0,
diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
index f40f7a68702ca..234aaca931bed 100644
--- a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
+++ b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(4,17): error TS2322: Type 'false' is not assignable to type 'string'.
-tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS2737: Property 'id' is missing in type { name: string; }' but present in type '{ id: number; name?: string; }'.
+tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type '{ id: number; name?: string; }'.
 
 
 ==== tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts (3 errors) ====
@@ -15,4 +15,4 @@ tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS
 !!! related TS6500 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts:1:31: The expected type comes from property 'name' which is declared here on type '{ id: number; name?: string; }'
     foo({ name: "hello" });            // Error, id required but missing
         ~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'id' is missing in type { name: string; }' but present in type '{ id: number; name?: string; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type '{ id: number; name?: string; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
index 0b707e0bbd664..20a74544b8b6e 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(31,1): error TS2322: Type '() => number' is not assignable to type 'T'.
-  Property 'f' is missing in type () => number' but present in type 'T'.
+  Property 'f' is missing in type '() => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(32,1): error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type (x: number) => string' but present in type 'T'.
+  Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(33,1): error TS2322: Type '() => number' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type () => number' but present in type '{ f(x: number): void; }'.
+  Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(34,1): error TS2322: Type '(x: number) => string' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type (x: number) => string' but present in type '{ f(x: number): void; }'.
+  Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(42,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
@@ -17,9 +17,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(44,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-  Property 'f' is missing in type (x: string) => number' but present in type 'T'.
+  Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(45,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type (x: string) => string' but present in type 'T'.
+  Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(46,1): error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
@@ -31,9 +31,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(48,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type (x: string) => number' but present in type '{ f(x: number): void; }'.
+  Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type (x: string) => string' but present in type '{ f(x: number): void; }'.
+  Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts (12 errors) ====
@@ -70,19 +70,19 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type () => number' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type 'T'.
     t = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
     a = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type () => number' but present in type '{ f(x: number): void; }'.
+!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
     a = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type '{ f(x: number): void; }'.
+!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
     
     interface S2 {
         f(x: string): void;
@@ -107,11 +107,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
@@ -129,9 +129,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     a = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type '{ f(x: number): void; }'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type '{ f(x: number): void; }'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
index 3ca208e2ba193..994d1041803ea 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
@@ -36,7 +36,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-        Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
+        Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(80,1): error TS2322: Type '(x: Base[], y: Derived2[]) => Derived[]' is not assignable to type '<T extends Base[]>(x: Base[], y: T) => Derived[]'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type 'Derived2[]'.
@@ -184,7 +184,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:         Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
+!!! error TS2322:         Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
     var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
index d9bfb91081d13..4d2853a6505e8 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(23,1): error TS2322: Type '() => number' is not assignable to type 'T'.
-  Property 'f' is missing in type () => number' but present in type 'T'.
+  Property 'f' is missing in type '() => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(24,1): error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type (x: number) => string' but present in type 'T'.
+  Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(25,1): error TS2322: Type '() => number' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type () => number' but present in type '{ f: new (x: number) => void; }'.
+  Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(26,1): error TS2322: Type '(x: number) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type (x: number) => string' but present in type '{ f: new (x: number) => void; }'.
+  Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(34,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
@@ -15,9 +15,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(36,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-  Property 'f' is missing in type (x: string) => number' but present in type 'T'.
+  Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(37,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type (x: string) => string' but present in type 'T'.
+  Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(38,1): error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
@@ -27,9 +27,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(40,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type (x: string) => number' but present in type '{ f: new (x: number) => void; }'.
+  Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(41,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type (x: string) => string' but present in type '{ f: new (x: number) => void; }'.
+  Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts (12 errors) ====
@@ -58,19 +58,19 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type () => number' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type 'T'.
     t = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
     a = () => 1;
     ~
 !!! error TS2322: Type '() => number' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type () => number' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
     a = function (x: number) { return ''; }
     ~
 !!! error TS2322: Type '(x: number) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type (x: number) => string' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
     
     interface S2 {
         f(x: string): void;
@@ -93,11 +93,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type 'T'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
@@ -113,9 +113,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     a = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => number' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type (x: string) => string' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
index a5cda1700a7d1..f6248d05071c3 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
@@ -36,7 +36,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-        Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
+        Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(80,1): error TS2322: Type 'new (x: Base[], y: Derived2[]) => Derived[]' is not assignable to type 'new <T extends Base[]>(x: Base[], y: T) => Derived[]'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type 'Derived2[]'.
@@ -184,7 +184,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:         Property 'bar' is missing in type Base' but present in type '{ foo: string; bar: string; }'.
+!!! error TS2322:         Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
     var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
index b23274cb2466d..5094c1c1584ae 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(14,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Base' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(18,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -41,7 +41,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
index 3d1f92a254f62..c4c0cf984cd39 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(14,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Base' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(18,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -41,7 +41,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
index 34a2aee6b7054..87e030364787c 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(14,1): error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Base' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(23,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type Derived' but present in type 'Derived2'.
+      Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -30,7 +30,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     b = a; // ok
     
     class B2 extends A {
@@ -44,7 +44,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Derived' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type Derived' but present in type 'Derived2'.
+!!! error TS2322:       Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
     
     module Generics {
         class A<T extends Derived> {
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
index 772b9348140e3..9437f318bf5f9 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(24,5): error TS2322: Type 'T' is not assignable to type 'S'.
   Types of property 'foo' are incompatible.
     Type 'Derived2' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Derived2' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(25,5): error TS2322: Type 'S' is not assignable to type 'T'.
   Types of property 'foo' are incompatible.
     Type 'Derived' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type Derived' but present in type 'Derived2'.
+      Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(29,5): error TS2322: Type 'T2' is not assignable to type 'S2'.
   Types of property 'foo' are incompatible.
     Type 'Derived2' is not assignable to type 'Derived'.
@@ -42,7 +42,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(70,5): error TS2322: Type 'S' is not assignable to type 'T'.
   Types of property 'foo' are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type Base' but present in type 'Derived2'.
+      Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(75,5): error TS2322: Type 'S2' is not assignable to type 'T2'.
   Types of property 'foo' are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -83,13 +83,13 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'T' is not assignable to type 'S'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'Derived2' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type Derived2' but present in type 'Derived'.
+!!! error TS2322:       Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
         t = s; // error
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'Derived' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type Derived' but present in type 'Derived2'.
+!!! error TS2322:       Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
         s = s2; // ok
         s = a2; // ok
     
@@ -183,7 +183,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type Base' but present in type 'Derived2'.
+!!! error TS2322:       Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
         s = s2; // ok
         s = a2; // ok
     
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
index dcdac53dde3e0..ae1a049d1941d 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(13,1): error TS2322: Type 'I' is not assignable to type 'C'.
-  Property 'foo' is missing in type I' but present in type 'C'.
+  Property 'foo' is missing in type 'I' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(14,1): error TS2322: Type 'C' is not assignable to type 'I'.
-  Property 'fooo' is missing in type C' but present in type 'I'.
+  Property 'fooo' is missing in type 'C' but present in type 'I'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts (2 errors) ====
@@ -20,8 +20,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     c = i; // error
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
-!!! error TS2322:   Property 'foo' is missing in type I' but present in type 'C'.
+!!! error TS2322:   Property 'foo' is missing in type 'I' but present in type 'C'.
     i = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'I'.
-!!! error TS2322:   Property 'fooo' is missing in type C' but present in type 'I'.
\ No newline at end of file
+!!! error TS2322:   Property 'fooo' is missing in type 'C' but present in type 'I'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
index 48055cdbf8df5..fc3cc1c7f1ce6 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
@@ -8,23 +8,23 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(41,5): error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(74,5): error TS2322: Type 'D' is not assignable to type 'C'.
-  Property 'opt' is missing in type D' but present in type 'C'.
+  Property 'opt' is missing in type 'D' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(75,5): error TS2322: Type 'E' is not assignable to type 'C'.
-  Property 'opt' is missing in type E' but present in type 'C'.
+  Property 'opt' is missing in type 'E' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(76,5): error TS2322: Type 'F' is not assignable to type 'C'.
-  Property 'opt' is missing in type F' but present in type 'C'.
+  Property 'opt' is missing in type 'F' but present in type 'C'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(79,5): error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
+  Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(80,5): error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
+  Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(81,5): error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
+  Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(84,5): error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
+  Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(85,5): error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
+  Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
+  Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts (18 errors) ====
@@ -122,43 +122,43 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         c = d; // error
         ~
 !!! error TS2322: Type 'D' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type D' but present in type 'C'.
+!!! error TS2322:   Property 'opt' is missing in type 'D' but present in type 'C'.
         c = e; // error
         ~
 !!! error TS2322: Type 'E' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type E' but present in type 'C'.
+!!! error TS2322:   Property 'opt' is missing in type 'E' but present in type 'C'.
         c = f; // error
         ~
 !!! error TS2322: Type 'F' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type F' but present in type 'C'.
+!!! error TS2322:   Property 'opt' is missing in type 'F' but present in type 'C'.
         c = a; // ok
     
         a = d; // error
         ~
 !!! error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
+!!! error TS2322:   Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
         a = e; // error
         ~
 !!! error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
+!!! error TS2322:   Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
         a = f; // error
         ~
 !!! error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
+!!! error TS2322:   Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
         a = c; // ok
     
         b = d; // error
         ~
 !!! error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type D' but present in type '{ opt: Base; }'.
+!!! error TS2322:   Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
         b = e; // error
         ~
 !!! error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type E' but present in type '{ opt: Base; }'.
+!!! error TS2322:   Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
         b = f; // error
         ~
 !!! error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type F' but present in type '{ opt: Base; }'.
+!!! error TS2322:   Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
         b = a; // ok
         b = c; // ok
     }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
index 65fcacc51964e..81ea7ef45ea9c 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
@@ -1,61 +1,61 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(21,5): error TS2322: Type 'T' is not assignable to type 'S'.
-  Property ''1'' is missing in type T' but present in type 'S'.
+  Property ''1'' is missing in type 'T' but present in type 'S'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(22,5): error TS2322: Type 'S' is not assignable to type 'T'.
-  Property ''1.'' is missing in type S' but present in type 'T'.
+  Property ''1.'' is missing in type 'S' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(24,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
+  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(26,5): error TS2322: Type 'T2' is not assignable to type 'S2'.
-  Property ''1'' is missing in type T2' but present in type 'S2'.
+  Property ''1'' is missing in type 'T2' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(27,5): error TS2322: Type 'S2' is not assignable to type 'T2'.
-  Property ''1.0'' is missing in type S2' but present in type 'T2'.
+  Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(28,5): error TS2322: Type 'T' is not assignable to type 'S2'.
-  Property ''1'' is missing in type T' but present in type 'S2'.
+  Property ''1'' is missing in type 'T' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(29,5): error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type { '1.0': string; baz?: string; }' but present in type 'S2'.
+  Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(30,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
+  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(32,5): error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type { '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(33,5): error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ '1.0': string; baz?: string; }'.
-  Property ''1.0'' is missing in type { '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
+  Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(34,5): error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(35,5): error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(36,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(38,5): error TS2322: Type '{ '1': string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type { '1': string; }' but present in type '{ '1.0': string; }'.
+  Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(39,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1': string; }'.
-  Property ''1'' is missing in type { '1.0': string; }' but present in type '{ '1': string; }'.
+  Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(42,5): error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
+  Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(65,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
+  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(71,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
+  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(73,5): error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(74,5): error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ 1.0: string; baz?: string; }'.
-  Property '1.0' is missing in type { '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
+  Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(75,5): error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(76,5): error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(77,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(78,5): error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type { 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
+  Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(80,5): error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type { 1.: string; }' but present in type '{ '1.0': string; }'.
+  Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(81,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ 1.: string; }'.
-  Property '1.' is missing in type { '1.0': string; }' but present in type '{ 1.: string; }'.
+  Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(82,5): error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
+  Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(83,5): error TS2322: Type 'T2' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type T2' but present in type '{ '1.0': string; }'.
+  Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
+  Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts (29 errors) ====
@@ -82,73 +82,73 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = t;
         ~
 !!! error TS2322: Type 'T' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type T' but present in type 'S'.
+!!! error TS2322:   Property ''1'' is missing in type 'T' but present in type 'S'.
         t = s;
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
-!!! error TS2322:   Property ''1.'' is missing in type S' but present in type 'T'.
+!!! error TS2322:   Property ''1.'' is missing in type 'S' but present in type 'T'.
         s = s2; // ok
         s = a2;
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
+!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
     
         s2 = t2;
         ~~
 !!! error TS2322: Type 'T2' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type T2' but present in type 'S2'.
+!!! error TS2322:   Property ''1'' is missing in type 'T2' but present in type 'S2'.
         t2 = s2;
         ~~
 !!! error TS2322: Type 'S2' is not assignable to type 'T2'.
-!!! error TS2322:   Property ''1.0'' is missing in type S2' but present in type 'T2'.
+!!! error TS2322:   Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
         s2 = t;
         ~~
 !!! error TS2322: Type 'T' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type T' but present in type 'S2'.
+!!! error TS2322:   Property ''1'' is missing in type 'T' but present in type 'S2'.
         s2 = b;
         ~~
 !!! error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; baz?: string; }' but present in type 'S2'.
+!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
         s2 = a2;
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
+!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
     
         a = b;
         ~
 !!! error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type { '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
         b = a;
         ~
 !!! error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ '1.0': string; baz?: string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type { '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
         a = s;
         ~
 !!! error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
         a = s2;
         ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
         a = a2;
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
     
         a2 = b2;
         ~~
 !!! error TS2322: Type '{ '1': string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type { '1': string; }' but present in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
         b2 = a2;
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1': string; }'.
-!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type '{ '1': string; }'.
+!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
         a2 = b; // ok
         a2 = t2; // ok
         a2 = t;
         ~~
 !!! error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
     }
     
     module NumbersAndStrings {
@@ -174,7 +174,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = a2; // error
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S'.
+!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
     
         s2 = t2; // ok
         t2 = s2; // ok
@@ -183,51 +183,51 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s2 = a2; // error
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type { '1.0': string; }' but present in type 'S2'.
+!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
     
         a = b; // error
         ~
 !!! error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
         b = a; // error
         ~
 !!! error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ 1.0: string; baz?: string; }'.
-!!! error TS2322:   Property '1.0' is missing in type { '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
+!!! error TS2322:   Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
         a = s; // error
         ~
 !!! error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type S' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
         a = s2; // error
         ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type S2' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
         a = a2; // error
         ~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type { '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
         a = b2; // error
         ~
 !!! error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type { 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2322:   Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
     
         a2 = b2; // error
         ~~
 !!! error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type { 1.: string; }' but present in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
         b2 = a2; // error
         ~~
 !!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ 1.: string; }'.
-!!! error TS2322:   Property '1.' is missing in type { '1.0': string; }' but present in type '{ 1.: string; }'.
+!!! error TS2322:   Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
         a2 = b; // error
         ~~
 !!! error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type { 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
         a2 = t2; // error
         ~~
 !!! error TS2322: Type 'T2' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type T2' but present in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
         a2 = t; // error
         ~~
 !!! error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type T' but present in type '{ '1.0': string; }'.
+!!! error TS2322:   Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
index 8304e9597516e..931aca5bfaf64 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(15,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Base' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(19,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -48,7 +48,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
index d820a71af3be0..2b1840093c27a 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(15,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Base' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(19,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -48,7 +48,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
index 59055a08741ee..df088bcc028e5 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(10,1): error TS2322: Type '""' is not assignable to type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type string[]' but present in type 'Applicable'.
+  Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(12,1): error TS2322: Type '4' is not assignable to type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type {}' but present in type 'Applicable'.
+  Property 'apply' is missing in type '{}' but present in type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
-tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(25,4): error TS2737: Property 'apply' is missing in type {}' but present in type 'Applicable'.
+tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(25,4): error TS2737: Property 'apply' is missing in type '{}' but present in type 'Applicable'.
 
 
 ==== tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts (8 errors) ====
@@ -26,14 +26,14 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
     x = [''];
     ~
 !!! error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type string[]' but present in type 'Applicable'.
+!!! error TS2322:   Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Applicable'.
     x = {};
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type {}' but present in type 'Applicable'.
+!!! error TS2322:   Property 'apply' is missing in type '{}' but present in type 'Applicable'.
     
     // Should work
     function f() { };
@@ -53,7 +53,7 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
     fn({});
        ~~
-!!! error TS2737: Property 'apply' is missing in type {}' but present in type 'Applicable'.
+!!! error TS2737: Property 'apply' is missing in type '{}' but present in type 'Applicable'.
     
     
     // Should work
diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
index c6099d3d2ddcb..6c481156bd97b 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(10,1): error TS2322: Type '""' is not assignable to type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Callable'.
-  Property 'call' is missing in type string[]' but present in type 'Callable'.
+  Property 'call' is missing in type 'string[]' but present in type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(12,1): error TS2322: Type '4' is not assignable to type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Callable'.
-  Property 'call' is missing in type {}' but present in type 'Callable'.
+  Property 'call' is missing in type '{}' but present in type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
-tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(25,4): error TS2737: Property 'call' is missing in type {}' but present in type 'Callable'.
+tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(25,4): error TS2737: Property 'call' is missing in type '{}' but present in type 'Callable'.
 
 
 ==== tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts (8 errors) ====
@@ -26,14 +26,14 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
     x = [''];
     ~
 !!! error TS2322: Type 'string[]' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type string[]' but present in type 'Callable'.
+!!! error TS2322:   Property 'call' is missing in type 'string[]' but present in type 'Callable'.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Callable'.
     x = {};
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type {}' but present in type 'Callable'.
+!!! error TS2322:   Property 'call' is missing in type '{}' but present in type 'Callable'.
     
     // Should work
     function f() { };
@@ -53,7 +53,7 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
     fn({});
        ~~
-!!! error TS2737: Property 'call' is missing in type {}' but present in type 'Callable'.
+!!! error TS2737: Property 'call' is missing in type '{}' but present in type 'Callable'.
     
     
     // Should work
diff --git a/tests/baselines/reference/bases.errors.txt b/tests/baselines/reference/bases.errors.txt
index 92fa723ad5300..135241aa3d8de 100644
--- a/tests/baselines/reference/bases.errors.txt
+++ b/tests/baselines/reference/bases.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/bases.ts(7,14): error TS2339: Property 'y' does not exist o
 tests/cases/compiler/bases.ts(7,15): error TS1005: ';' expected.
 tests/cases/compiler/bases.ts(7,17): error TS2693: 'any' only refers to a type, but is being used as a value here.
 tests/cases/compiler/bases.ts(11,7): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property 'x' is missing in type C' but present in type 'I'.
+  Property 'x' is missing in type 'C' but present in type 'I'.
 tests/cases/compiler/bases.ts(12,5): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/bases.ts(13,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/bases.ts(13,14): error TS2339: Property 'x' does not exist on type 'C'.
@@ -32,7 +32,7 @@ tests/cases/compiler/bases.ts(18,9): error TS2339: Property 'y' does not exist o
     class C extends B implements I {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'x' is missing in type C' but present in type 'I'.
+!!! error TS2420:   Property 'x' is missing in type 'C' but present in type 'I'.
         constructor() {
         ~~~~~~~~~~~~~~~
             this.x: any;
diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt
index bb7c85ea9a4c4..49226e2eff2bc 100644
--- a/tests/baselines/reference/bluebirdStaticThis.errors.txt
+++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/bluebirdStaticThis.ts(5,22): error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
-  Property 'then' is missing in type Promise<R>' but present in type 'Thenable<R>'.
+  Property 'then' is missing in type 'Promise<R>' but present in type 'Thenable<R>'.
 tests/cases/compiler/bluebirdStaticThis.ts(22,51): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Resolver'.
 tests/cases/compiler/bluebirdStaticThis.ts(57,109): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'.
 tests/cases/compiler/bluebirdStaticThis.ts(58,91): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'.
@@ -15,7 +15,7 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace '"tes
     export declare class Promise<R> implements Promise.Thenable<R> {
                          ~~~~~~~
 !!! error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
-!!! error TS2420:   Property 'then' is missing in type Promise<R>' but present in type 'Thenable<R>'.
+!!! error TS2420:   Property 'then' is missing in type 'Promise<R>' but present in type 'Thenable<R>'.
     	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
         static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
         static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
diff --git a/tests/baselines/reference/castingTuple.errors.txt b/tests/baselines/reference/castingTuple.errors.txt
index 40c6758207340..c7bffb9ad5a12 100644
--- a/tests/baselines/reference/castingTuple.errors.txt
+++ b/tests/baselines/reference/castingTuple.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2737: Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
+tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2737: Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(14,15): error TS2352: Conversion of type '[number, string, boolean]' to type '[number, string]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Types of property 'length' are incompatible.
     Type '3' is not comparable to type '2'.
 tests/cases/conformance/types/tuple/castingTuple.ts(15,14): error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-tests/cases/conformance/types/tuple/castingTuple.ts(18,21): error TS2737: Property '2' is missing in type [C, D]' but present in type '[C, D, A]'.
+tests/cases/conformance/types/tuple/castingTuple.ts(18,21): error TS2737: Property '2' is missing in type '[C, D]' but present in type '[C, D, A]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(20,33): error TS2339: Property '5' does not exist on type '[C, D, A]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(30,10): error TS2352: Conversion of type '[number, string]' to type '[number, number]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Type 'string' is not comparable to type 'number'.
 tests/cases/conformance/types/tuple/castingTuple.ts(31,10): error TS2352: Conversion of type '[C, D]' to type '[A, I]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'a' is missing in type C' but present in type 'A'.
+  Property 'a' is missing in type 'C' but present in type 'A'.
 tests/cases/conformance/types/tuple/castingTuple.ts(32,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot find name 't4'.
 
@@ -28,7 +28,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var emptyObjTuple = <[{}, {}]>numStrTuple;
     var numStrBoolTuple = <[number, string, boolean]>numStrTuple;
                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
+!!! error TS2737: Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
     var shorter = numStrBoolTuple as [number, string]
                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type '[number, string, boolean]' to type '[number, string]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
@@ -41,7 +41,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var interfaceIITuple = <[I, I]>classCDTuple;
     var classCDATuple = <[C, D, A]>classCDTuple;
                         ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property '2' is missing in type [C, D]' but present in type '[C, D, A]'.
+!!! error TS2737: Property '2' is missing in type '[C, D]' but present in type '[C, D, A]'.
     var eleFromCDA1 = classCDATuple[2]; // A
     var eleFromCDA2 = classCDATuple[5]; // C | D | A
                                     ~
@@ -62,7 +62,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var t9 = <[A, I]>classCDTuple;
              ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type '[C, D]' to type '[A, I]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'a' is missing in type C' but present in type 'A'.
+!!! error TS2352:   Property 'a' is missing in type 'C' but present in type 'A'.
     var array1 = <number[]>numStrTuple;
         ~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
diff --git a/tests/baselines/reference/chainedAssignment1.errors.txt b/tests/baselines/reference/chainedAssignment1.errors.txt
index e6fdbd58026e0..13c77d7ca41ad 100644
--- a/tests/baselines/reference/chainedAssignment1.errors.txt
+++ b/tests/baselines/reference/chainedAssignment1.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/chainedAssignment1.ts(21,1): error TS2322: Type 'Z' is not assignable to type 'X'.
-  Property 'a' is missing in type Z' but present in type 'X'.
+  Property 'a' is missing in type 'Z' but present in type 'X'.
 tests/cases/compiler/chainedAssignment1.ts(21,6): error TS2322: Type 'Z' is not assignable to type 'Y'.
   Type 'Z' is missing the following properties from type 'Y': a, b
 tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not assignable to type 'Y'.
@@ -29,7 +29,7 @@ tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not
     c1 = c2 = c3; // a bug made this not report the same error as below
     ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'X'.
-!!! error TS2322:   Property 'a' is missing in type Z' but present in type 'X'.
+!!! error TS2322:   Property 'a' is missing in type 'Z' but present in type 'X'.
          ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'Y'.
 !!! error TS2322:   Type 'Z' is missing the following properties from type 'Y': a, b
diff --git a/tests/baselines/reference/chainedAssignment3.errors.txt b/tests/baselines/reference/chainedAssignment3.errors.txt
index e556cfb65e843..88620284d24a5 100644
--- a/tests/baselines/reference/chainedAssignment3.errors.txt
+++ b/tests/baselines/reference/chainedAssignment3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/chainedAssignment3.ts(18,1): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'value' is missing in type A' but present in type 'B'.
+  Property 'value' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not assignable to type 'B'.
 
 
@@ -24,7 +24,7 @@ tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not
     b = a = new A();
     ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'value' is missing in type A' but present in type 'B'.
+!!! error TS2322:   Property 'value' is missing in type 'A' but present in type 'B'.
     a = b = new A();
         ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
diff --git a/tests/baselines/reference/chainedAssignmentChecking.errors.txt b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
index 0bb93671f7912..bdf4a0af646ee 100644
--- a/tests/baselines/reference/chainedAssignmentChecking.errors.txt
+++ b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/chainedAssignmentChecking.ts(21,1): error TS2322: Type 'Z' is not assignable to type 'X'.
-  Property 'a' is missing in type Z' but present in type 'X'.
+  Property 'a' is missing in type 'Z' but present in type 'X'.
 tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2322: Type 'Z' is not assignable to type 'Y'.
   Type 'Z' is missing the following properties from type 'Y': a, b
 
@@ -28,7 +28,7 @@ tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2322: Type 'Z'
     c1 = c2 = c3; // Should be error
     ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'X'.
-!!! error TS2322:   Property 'a' is missing in type Z' but present in type 'X'.
+!!! error TS2322:   Property 'a' is missing in type 'Z' but present in type 'X'.
          ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'Y'.
 !!! error TS2322:   Type 'Z' is missing the following properties from type 'Y': a, b
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
index 262bdb438d72a..0b7e8e320f36a 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,64): error TS2322: Type 'B' is not assignable to type 'C'.
-  Property 'z' is missing in type B' but present in type 'C'.
+  Property 'z' is missing in type 'B' but present in type 'C'.
 
 
 ==== tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts (1 errors) ====
@@ -24,5 +24,5 @@ tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParamete
     (new Chain(new A)).then(a => new B).then(b => new C).then(c => new B).then(b => new A);
                                                                    ~~~~~
 !!! error TS2322: Type 'B' is not assignable to type 'C'.
-!!! error TS2322:   Property 'z' is missing in type B' but present in type 'C'.
+!!! error TS2322:   Property 'z' is missing in type 'B' but present in type 'C'.
 !!! 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/checkJsdocTypeTag6.errors.txt b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
index 4b4f3f037b10c..3c6928dc4f52d 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
+++ b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsdoc/test.js(1,5): error TS8030: The type of a function declaration must match the function's signature.
 tests/cases/conformance/jsdoc/test.js(7,5): error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
-  Property 'prop' is missing in type (prop: any) => void' but present in type '{ prop: string; }'.
+  Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
 tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a function declaration must match the function's signature.
 
 
@@ -16,7 +16,7 @@ tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a functio
     var g = function (prop) {
         ~
 !!! error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
-!!! error TS2322:   Property 'prop' is missing in type (prop: any) => void' but present in type '{ prop: string; }'.
+!!! error TS2322:   Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
     }
     
     /** @type {(a: number) => number} */
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
index 81606fe1b4d6b..6d14eb3836ed2 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsx/file.tsx(14,10): error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-    Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
+    Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
 tests/cases/conformance/jsx/file.tsx(17,11): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
 tests/cases/conformance/jsx/file.tsx(31,6): error TS2322: Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'Prop'.
@@ -46,7 +46,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
              ~~~~
 !!! error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
 !!! error TS2322:   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
+!!! error TS2322:     Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
     
     let k0 =
         <Comp a={10} b="hi" children="Random" >
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
index 42c7eda8a4c29..7ea8470549ba3 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-    Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
+    Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
 tests/cases/conformance/jsx/file.tsx(24,6): error TS2322: Type '{ children: Element; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
@@ -37,7 +37,7 @@ tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: type
              ~~~~
 !!! error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
 !!! error TS2322:   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'children' is missing in type { a: number; b: string; }' but present in type 'Prop'.
+!!! error TS2322:     Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
     
     // Error: JSX.element is not the same as JSX.ElementClass
     let k1 =
diff --git a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
index 92cdc904c2212..cd554ae82488c 100644
--- a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
+++ b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
@@ -10,7 +10,7 @@ tests/cases/conformance/salsa/second.ts(14,7): error TS2417: Class static side '
     Type '(others: (typeof Wagon)[]) => number' is not assignable to type '(wagons?: Wagon[]) => number'.
       Types of parameters 'others' and 'wagons' are incompatible.
         Type 'Wagon[]' is not assignable to type '(typeof Wagon)[]'.
-          Property 'circle' is missing in type Wagon' but present in type 'typeof Wagon'.
+          Property 'circle' is missing in type 'Wagon' but present in type 'typeof Wagon'.
 tests/cases/conformance/salsa/second.ts(17,15): error TS2345: Argument of type '"nope"' is not assignable to parameter of type 'number'.
 
 
@@ -96,7 +96,7 @@ tests/cases/conformance/salsa/second.ts(17,15): error TS2345: Argument of type '
 !!! error TS2417:     Type '(others: (typeof Wagon)[]) => number' is not assignable to type '(wagons?: Wagon[]) => number'.
 !!! error TS2417:       Types of parameters 'others' and 'wagons' are incompatible.
 !!! error TS2417:         Type 'Wagon[]' is not assignable to type '(typeof Wagon)[]'.
-!!! error TS2417:           Property 'circle' is missing in type Wagon' but present in type 'typeof Wagon'.
+!!! error TS2417:           Property 'circle' is missing in type 'Wagon' but present in type 'typeof Wagon'.
         constructor(public drunkOO: true) {
             // error: wrong type
             super('nope');
diff --git a/tests/baselines/reference/classImplementsClass2.errors.txt b/tests/baselines/reference/classImplementsClass2.errors.txt
index f67527d46cf0f..8bbca48958a68 100644
--- a/tests/baselines/reference/classImplementsClass2.errors.txt
+++ b/tests/baselines/reference/classImplementsClass2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/classImplementsClass2.ts(2,7): error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-  Property 'foo' is missing in type C' but present in type 'A'.
+  Property 'foo' is missing in type 'C' but present in type 'A'.
 tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is not assignable to type 'C2'.
-  Property 'foo' is missing in type C' but present in type 'C2'.
+  Property 'foo' is missing in type 'C' but present in type 'C2'.
 
 
 ==== tests/cases/compiler/classImplementsClass2.ts (2 errors) ====
@@ -9,7 +9,7 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is n
     class C implements A {} // error
           ~
 !!! error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-!!! error TS2720:   Property 'foo' is missing in type C' but present in type 'A'.
+!!! error TS2720:   Property 'foo' is missing in type 'C' but present in type 'A'.
     
     class C2 extends A {
         foo() {
@@ -23,4 +23,4 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is n
     c2 = c;
     ~~
 !!! error TS2322: Type 'C' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'foo' is missing in type C' but present in type 'C2'.
\ No newline at end of file
+!!! error TS2322:   Property 'foo' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass4.errors.txt b/tests/baselines/reference/classImplementsClass4.errors.txt
index bb9d8833a3b1e..fd597ba1b3848 100644
--- a/tests/baselines/reference/classImplementsClass4.errors.txt
+++ b/tests/baselines/reference/classImplementsClass4.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/classImplementsClass4.ts(5,7): error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-  Property 'x' is missing in type C' but present in type 'A'.
+  Property 'x' is missing in type 'C' but present in type 'A'.
 tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is not assignable to type 'C2'.
-  Property 'x' is missing in type C' but present in type 'C2'.
+  Property 'x' is missing in type 'C' but present in type 'C2'.
 
 
 ==== tests/cases/compiler/classImplementsClass4.ts (2 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is n
     class C implements A {
           ~
 !!! error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type C' but present in type 'A'.
+!!! error TS2720:   Property 'x' is missing in type 'C' but present in type 'A'.
         foo() {
             return 1;
         }
@@ -26,4 +26,4 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is n
     c2 = c;
     ~~
 !!! error TS2322: Type 'C' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'x' is missing in type C' but present in type 'C2'.
\ No newline at end of file
+!!! error TS2322:   Property 'x' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass7.errors.txt b/tests/baselines/reference/classImplementsClass7.errors.txt
index da84b8b2fe05f..dd2eb366fe4da 100644
--- a/tests/baselines/reference/classImplementsClass7.errors.txt
+++ b/tests/baselines/reference/classImplementsClass7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/classImplementsClass7.ts(5,7): error TS2720: Class 'B' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-  Property 'x' is missing in type B' but present in type 'A'.
+  Property 'x' is missing in type 'B' but present in type 'A'.
 
 
 ==== tests/cases/compiler/classImplementsClass7.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/compiler/classImplementsClass7.ts(5,7): error TS2720: Class 'B' inco
     class B implements A {}
           ~
 !!! error TS2720: Class 'B' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type B' but present in type 'A'.
+!!! error TS2720:   Property 'x' is missing in type 'B' but present in type 'A'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
index e12dd4f08e394..1275ca401443e 100644
--- a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(9,7): error TS2720: Class 'C2' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
   Type 'C2' is missing the following properties from type 'C1': x, y
 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(12,7): error TS2720: Class 'C3' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-  Property 'y' is missing in type C3' but present in type 'C1'.
+  Property 'y' is missing in type 'C3' but present in type 'C1'.
 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(16,7): error TS2720: Class 'C4' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-  Property 'x' is missing in type C4' but present in type 'C1'.
+  Property 'x' is missing in type 'C4' but present in type 'C1'.
 
 
 ==== tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts (3 errors) ====
@@ -24,14 +24,14 @@ tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInte
     class C3 implements C1 { // error -- missing y
           ~~
 !!! error TS2720: Class 'C3' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-!!! error TS2720:   Property 'y' is missing in type C3' but present in type 'C1'.
+!!! error TS2720:   Property 'y' is missing in type 'C3' but present in type 'C1'.
         x : number;
     }
     
     class C4 implements C1 { // error -- missing x
           ~~
 !!! error TS2720: Class 'C4' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
-!!! error TS2720:   Property 'x' is missing in type C4' but present in type 'C1'.
+!!! error TS2720:   Property 'x' is missing in type 'C4' but present in type 'C1'.
         y : number;
     }
     
diff --git a/tests/baselines/reference/clodulesDerivedClasses.errors.txt b/tests/baselines/reference/clodulesDerivedClasses.errors.txt
index 47fe5e13adaa2..dbc78d618535a 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.errors.txt
+++ b/tests/baselines/reference/clodulesDerivedClasses.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/clodulesDerivedClasses.ts(9,7): error TS2417: Class static side 'typeof Path' incorrectly extends base class static side 'typeof Shape'.
   Types of property 'Utils' are incompatible.
-    Property 'convert' is missing in type typeof Utils' but present in type 'typeof Utils'.
+    Property 'convert' is missing in type 'typeof Utils' but present in type 'typeof Utils'.
 
 
 ==== tests/cases/compiler/clodulesDerivedClasses.ts (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/clodulesDerivedClasses.ts(9,7): error TS2417: Class static
           ~~~~
 !!! error TS2417: Class static side 'typeof Path' incorrectly extends base class static side 'typeof Shape'.
 !!! error TS2417:   Types of property 'Utils' are incompatible.
-!!! error TS2417:     Property 'convert' is missing in type typeof Utils' but present in type 'typeof Utils'.
+!!! error TS2417:     Property 'convert' is missing in type 'typeof Utils' but present in type 'typeof Utils'.
         name: string;
     
     }
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
index 12220883faa2f..adc246de6988e 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(15,5): error TS2322: Type 'A | B' is not assignable to type 'A'.
   Type 'B' is not assignable to type 'A'.
-    Property 'propertyA' is missing in type B' but present in type 'A'.
+    Property 'propertyA' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(16,5): error TS2322: Type 'A | B' is not assignable to type 'B'.
   Type 'A' is not assignable to type 'B'.
-    Property 'propertyB' is missing in type A' but present in type 'B'.
+    Property 'propertyB' is missing in type 'A' but present in type 'B'.
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(19,5): error TS2322: Type '((m: X) => number) | ((n: X) => string)' is not assignable to type '(t: X) => number'.
   Type '(n: X) => string' is not assignable to type '(t: X) => number'.
     Type 'string' is not assignable to type 'number'.
@@ -34,12 +34,12 @@ tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithou
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'A'.
 !!! error TS2322:   Type 'B' is not assignable to type 'A'.
-!!! error TS2322:     Property 'propertyA' is missing in type B' but present in type 'A'.
+!!! error TS2322:     Property 'propertyA' is missing in type 'B' but present in type 'A'.
     var result3: B = true ? a : b;
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'B'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'propertyB' is missing in type A' but present in type 'B'.
+!!! error TS2322:     Property 'propertyB' is missing in type 'A' but present in type 'B'.
     var result31: A | B = true ? a : b;
     
     var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt
index 80b6f9d760d9c..f421eea882a0d 100644
--- a/tests/baselines/reference/conditionalTypes2.errors.txt
+++ b/tests/baselines/reference/conditionalTypes2.errors.txt
@@ -13,11 +13,11 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(25,5): error TS23
     Type 'A extends string ? keyof A : A' is not assignable to type 'B extends string ? keyof B : B'.
       Type 'A' is not assignable to type 'B'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(73,12): error TS2345: Argument of type 'Extract<Extract<T, Foo>, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-  Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+  Property 'bat' is missing in type 'Bar & Foo' but present in type '{ foo: string; bat: string; }'.
     Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
-      Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+      Property 'bat' is missing in type 'Bar & Foo' but present in type '{ foo: string; bat: string; }'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(74,12): error TS2345: Argument of type 'Extract<T, Foo & Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-  Property 'bat' is missing in type Foo & Bar' but present in type '{ foo: string; bat: string; }'.
+  Property 'bat' is missing in type 'Foo & Bar' but present in type '{ foo: string; bat: string; }'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2345: Argument of type 'Extract2<T, Foo, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
   Type 'T extends Bar ? T : never' is not assignable to type '{ foo: string; bat: string; }'.
     Type 'Bar & Foo & T' is not assignable to type '{ foo: string; bat: string; }'.
@@ -117,13 +117,13 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2
         fooBat(x);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract<Extract<T, Foo>, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-!!! error TS2345:   Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+!!! error TS2345:   Property 'bat' is missing in type 'Bar & Foo' but present in type '{ foo: string; bat: string; }'.
 !!! error TS2345:     Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
-!!! error TS2345:       Property 'bat' is missing in type Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+!!! error TS2345:       Property 'bat' is missing in type 'Bar & Foo' but present in type '{ foo: string; bat: string; }'.
         fooBat(y);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract<T, Foo & Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-!!! error TS2345:   Property 'bat' is missing in type Foo & Bar' but present in type '{ foo: string; bat: string; }'.
+!!! error TS2345:   Property 'bat' is missing in type 'Foo & Bar' but present in type '{ foo: string; bat: string; }'.
         fooBat(z);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract2<T, Foo, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
diff --git a/tests/baselines/reference/constraints0.errors.txt b/tests/baselines/reference/constraints0.errors.txt
index b0889b2b1c1b6..cb9b356024d8d 100644
--- a/tests/baselines/reference/constraints0.errors.txt
+++ b/tests/baselines/reference/constraints0.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/constraints0.ts(14,11): error TS2737: Property 'a' is missing in type B' but present in type 'A'.
+tests/cases/compiler/constraints0.ts(14,11): error TS2737: Property 'a' is missing in type 'B' but present in type 'A'.
 
 
 ==== tests/cases/compiler/constraints0.ts (1 errors) ====
@@ -17,6 +17,6 @@ tests/cases/compiler/constraints0.ts(14,11): error TS2737: Property 'a' is missi
     var v1: C<A>; // should work
     var v2: C<B>; // should not work
               ~
-!!! error TS2737: Property 'a' is missing in type B' but present in type 'A'.
+!!! error TS2737: Property 'a' is missing in type 'B' but present in type 'A'.
     
     var y = v1.x.a; // 'a' should be of type 'number'
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
index ecbb9efbbfd64..bcdbedf7af57e 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
   Types of parameters 'y' and 'e' are incompatible.
     Type 'Elephant' is not assignable to type 'Giraffe'.
-      Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
+      Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
 
 
 ==== tests/cases/compiler/contextualSignatureInstatiationContravariance.ts (1 errors) ====
@@ -17,7 +17,7 @@ tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): erro
 !!! error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
 !!! error TS2322:   Types of parameters 'y' and 'e' are incompatible.
 !!! error TS2322:     Type 'Elephant' is not assignable to type 'Giraffe'.
-!!! error TS2322:       Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
+!!! error TS2322:       Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
     
     var h2: (g1: Giraffe, g2: Giraffe) => void;
     h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypeWithTuple.errors.txt b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
index 6835340bb48af..5d7f4ce78a2bf 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
@@ -3,9 +3,9 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(3,5): error TS232
     Type '3' is not assignable to type '2'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(15,1): error TS2322: Type '[number, string, boolean]' is not assignable to type '[number, string]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(18,17): error TS2322: Type '{}' is not assignable to type '{ a: string; }'.
-  Property 'a' is missing in type {}' but present in type '{ a: string; }'.
+  Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(19,1): error TS2322: Type '[number, string]' is not assignable to type '[number, string, boolean]'.
-  Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
+  Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(20,5): error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
@@ -13,7 +13,7 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(23,1): error TS23
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(24,1): error TS2322: Type '[C, string | number]' is not assignable to type '[C, string | number, D]'.
-  Property '2' is missing in type [C, string | number]' but present in type '[C, string | number, D]'.
+  Property '2' is missing in type '[C, string | number]' but present in type '[C, string | number, D]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS2322: Type '[number, string | number]' is not assignable to type '[number, string]'.
   Type 'string | number' is not assignable to type 'string'.
     Type 'number' is not assignable to type 'string'.
@@ -46,11 +46,11 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
     objNumTuple = [ {}, 5];
                     ~~
 !!! error TS2322: Type '{}' is not assignable to type '{ a: string; }'.
-!!! error TS2322:   Property 'a' is missing in type {}' but present in type '{ a: string; }'.
+!!! error TS2322:   Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
     numStrBoolTuple = numStrTuple;
     ~~~~~~~~~~~~~~~
 !!! error TS2322: Type '[number, string]' is not assignable to type '[number, string, boolean]'.
-!!! error TS2322:   Property '2' is missing in type [number, string]' but present in type '[number, string, boolean]'.
+!!! error TS2322:   Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
     var strStrTuple: [string, string] = ["foo", "bar", 5];
         ~~~~~~~~~~~
 !!! error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
@@ -66,7 +66,7 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
     unionTuple2 = unionTuple;
     ~~~~~~~~~~~
 !!! error TS2322: Type '[C, string | number]' is not assignable to type '[C, string | number, D]'.
-!!! error TS2322:   Property '2' is missing in type [C, string | number]' but present in type '[C, string | number, D]'.
+!!! error TS2322:   Property '2' is missing in type '[C, string | number]' but present in type '[C, string | number, D]'.
     numStrTuple = unionTuple3;
     ~~~~~~~~~~~
 !!! error TS2322: Type '[number, string | number]' is not assignable to type '[number, string]'.
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
index cdeca6994d3cd..ae827a6cf3e38 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
@@ -15,7 +15,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
         Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(25,5): error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
   Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
-    Property 'anotherP1' is missing in type { prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
+    Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(29,5): error TS2322: Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
   Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
     Types of property 'prop' are incompatible.
@@ -74,7 +74,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
         ~~~~~~~~~~~~
 !!! error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
 !!! error TS2322:   Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
-!!! error TS2322:     Property 'anotherP1' is missing in type { prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
+!!! error TS2322:     Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
         prop: strOrNumber,
         anotherP: str
     };
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index aa7ae480ecc0c..6af387c8817f3 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/contextualTyping.ts(189,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not assignable to type 'B'.
-  Property 'x' is missing in type {}' but present in type 'B'.
+  Property 'x' is missing in type '{}' but present in type 'B'.
 
 
 ==== tests/cases/compiler/contextualTyping.ts (2 errors) ====
@@ -231,5 +231,5 @@ tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not
     var x: B = { };
         ~
 !!! error TS2322: Type '{}' is not assignable to type 'B'.
-!!! error TS2322:   Property 'x' is missing in type {}' but present in type 'B'.
+!!! error TS2322:   Property 'x' is missing in type '{}' but present in type 'B'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping11.errors.txt b/tests/baselines/reference/contextualTyping11.errors.txt
index 39bf5b542cfff..db77080a26a05 100644
--- a/tests/baselines/reference/contextualTyping11.errors.txt
+++ b/tests/baselines/reference/contextualTyping11.errors.txt
@@ -1,9 +1,9 @@
 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' but present in type '{ id: number; }'.
+  Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
 
 
 ==== 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:   Property 'id' is missing in type foo' but present in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2322:   Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping5.errors.txt b/tests/baselines/reference/contextualTyping5.errors.txt
index 53681ba9b3a15..29a0026ef506d 100644
--- a/tests/baselines/reference/contextualTyping5.errors.txt
+++ b/tests/baselines/reference/contextualTyping5.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/contextualTyping5.ts(1,20): error TS2322: Type '{}' is not assignable to type '{ id: number; }'.
-  Property 'id' is missing in type {}' but present in type '{ id: number; }'.
+  Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping5.ts (1 errors) ====
     class foo { public bar:{id:number;} = { }; }
                        ~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ id: number; }'.
-!!! error TS2322:   Property 'id' is missing in type {}' but present in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2322:   Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/covariantCallbacks.errors.txt b/tests/baselines/reference/covariantCallbacks.errors.txt
index 7eaf2b10c4c65..56225923d9e50 100644
--- a/tests/baselines/reference/covariantCallbacks.errors.txt
+++ b/tests/baselines/reference/covariantCallbacks.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(12,5): error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type A' but present in type 'B'.
+    Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(17,5): error TS2322: Type 'Promise<A>' is not assignable to type 'Promise<B>'.
   Type 'A' is not assignable to type 'B'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(30,5): error TS2322: Type 'AList1' is not assignable to type 'BList1'.
@@ -42,7 +42,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covarian
         ~
 !!! error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
     }
     
     function f2(a: Promise<A>, b: Promise<B>) {
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
index 6eea47311a44c..79fd1f4cbc1cd 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'.
-  Property 'x' is missing in type (x: "hi", items: string[]) => typeof foo' but present in type 'D'.
+  Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
 
 
 ==== tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts (1 errors) ====
@@ -14,5 +14,5 @@ tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): e
     var a: D = foo("hi", []);
         ~
 !!! error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'.
-!!! error TS2322:   Property 'x' is missing in type (x: "hi", items: string[]) => typeof foo' but present in type 'D'.
+!!! error TS2322:   Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt
index 1f3b6686b096c..69778c365a7c5 100644
--- a/tests/baselines/reference/declarationsAndAssignments.errors.txt
+++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt
@@ -18,7 +18,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,14):
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,11): error TS2339: Property 'a' does not exist on type 'undefined[]'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,14): error TS2339: Property 'b' does not exist on type 'undefined[]'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(106,17): error TS2322: Type '{ y: boolean; }' is not assignable to type '{ x: any; y?: boolean; }'.
-  Property 'x' is missing in type { y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
+  Property 'x' is missing in type '{ y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,6): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assignable to type 'string'.
 
@@ -170,7 +170,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9):
     f14([2, ["abc", { y: false }]]);  // Error, no x
                     ~~~~~~~~~~~~
 !!! error TS2322: Type '{ y: boolean; }' is not assignable to type '{ x: any; y?: boolean; }'.
-!!! error TS2322:   Property 'x' is missing in type { y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
+!!! error TS2322:   Property 'x' is missing in type '{ y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
     
     module M {
         export var [a, b] = [1, 2];
diff --git a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
index ac6bb7ebbb0a7..f81e4b7a1cd41 100644
--- a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
+++ b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22:17 - error TS2322: Type '{}' is not assignable to type 'A'.
-  Property 'a' is missing in type {}' but present in type 'A'.
+  Property 'a' is missing in type '{}' but present in type 'A'.
 
 22                 thing: {}
                    ~~~~~
@@ -9,7 +9,7 @@
                       ~~~~~
     The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:25:17 - error TS2322: Type '{}' is not assignable to type 'A'.
-  Property 'a' is missing in type {}' but present in type 'A'.
+  Property 'a' is missing in type '{}' but present in type 'A'.
 
 25                 another: {}
                    ~~~~~~~
@@ -45,14 +45,14 @@
                     thing: {}
                     ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'A'.
-!!! error TS2322:   Property 'a' is missing in type {}' but present in type 'A'.
+!!! error TS2322:   Property 'a' is missing in type '{}' but present in type 'A'.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17: The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
                 },
                 yetstill: {
                     another: {}
                     ~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'A'.
-!!! error TS2322:   Property 'a' is missing in type {}' but present in type 'A'.
+!!! error TS2322:   Property 'a' is missing in type '{}' but present in type 'A'.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17: The expected type comes from property 'another' which is declared here on type '{ another: A; }'
                 }
             }
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
index c0b605e591653..51eb90af27224 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
@@ -9,7 +9,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(30,14): error TS2300: Duplicate identifier 'z'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(30,18): error TS2300: Duplicate identifier 'z'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(34,6): error TS2322: Type 'number' is not assignable to type '{ x: any; y: { j: any; }; }'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(35,4): error TS2737: Property 'z' is missing in type {}' but present in type '{ z: number; }'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(35,4): error TS2737: Property 'z' is missing in type '{}' but present in type '{ z: number; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(36,6): error TS2322: Type 'true' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(37,6): error TS2322: Type 'false' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(38,6): error TS2322: Type 'true' is not assignable to type 'string | number'.
@@ -22,7 +22,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
     Types of parameters '__0' and '__0' are incompatible.
       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
-        Property 'c' is missing in type { x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
+        Property 'c' is missing in type '{ x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,18): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,26): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,34): error TS2300: Duplicate identifier 'number'.
@@ -86,7 +86,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2322: Type 'number' is not assignable to type '{ x: any; y: { j: any; }; }'.
     c1({});            // Error, implied type is {z:number}?
        ~~
-!!! error TS2737: Property 'z' is missing in type {}' but present in type '{ z: number; }'.
+!!! error TS2737: Property 'z' is missing in type '{}' but present in type '{ z: number; }'.
     c1({ z: true });   // Error, implied type is {z:number}?
          ~
 !!! error TS2322: Type 'true' is not assignable to type 'number'.
@@ -132,7 +132,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2416:   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
 !!! error TS2416:     Types of parameters '__0' and '__0' are incompatible.
 !!! error TS2416:       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
-!!! error TS2416:         Property 'c' is missing in type { x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
+!!! error TS2416:         Property 'c' is missing in type '{ x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
         e0([a, b, q]) { }
     }
     
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
index 4b77b5418cd2d..6bbdd4c73f47e 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(30,5): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(30,5): error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts (3 errors) ====
@@ -43,7 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
+!!! error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
index f214a6ee73339..32689853c0cee 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5i
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(30,5): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(30,5): error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts (3 errors) ====
@@ -43,7 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5i
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
+!!! error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
index 5e940a7eb6367..1a777698c9907 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(30,5): error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(30,5): error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts (3 errors) ====
@@ -43,7 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]], ...any[]]'.
+!!! error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
index 812a43b55f605..5cfcc94989ba4 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
@@ -3,7 +3,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(20,19): error TS2345: Argument of type 'true' is not assignable to parameter of type 'string | number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(21,7): error TS2552: Cannot find name 'array2'. Did you mean 'Array'?
 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 TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(23,4): error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]]]'.
 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'.
@@ -46,7 +46,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 !!! error TS2322: Type 'string' is not assignable to type '[[any]]'.
     a5([1, 2]);                              // Error, parameter type is [any, any, [[any]]]
        ~~~~~~
-!!! error TS2737: Property '2' is missing in type [number, number]' but present in type '[any, any, [[any]]]'.
+!!! error TS2737: Property '2' is missing in type '[number, number]' but present in type '[any, any, [[any]]]'.
     a6([1, 2, "string"]);                   // Error, parameter type is number[]
               ~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
index 24711dbb42a31..1cec6a88b18c5 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(47,6): error TS2322: Type 'Class' is not assignable to type 'D'.
-  Property 'foo' is missing in type Class' but present in type 'D'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2737: Property 'y' is missing in type {}' but present in type '{ y: D; }'.
+  Property 'foo' is missing in type 'Class' but present in type 'D'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2737: Property 'y' is missing in type '{}' but present in type '{ y: D; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(49,6): error TS2322: Type 'number' is not assignable to type 'D'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(50,6): error TS2322: Type 'string' is not assignable to type 'D'.
 
@@ -55,11 +55,11 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(
     d3({ y: new Class() });
          ~
 !!! error TS2322: Type 'Class' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo' is missing in type Class' but present in type 'D'.
+!!! error TS2322:   Property 'foo' is missing in type 'Class' but present in type 'D'.
 !!! related TS6500 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: The expected type comes from property 'y' which is declared here on type '{ y: D; }'
     d3({});
        ~~
-!!! error TS2737: Property 'y' is missing in type {}' but present in type '{ y: D; }'.
+!!! error TS2737: Property 'y' is missing in type '{}' but present in type '{ y: D; }'.
     d3({ y: 1 });
          ~
 !!! error TS2322: Type 'number' is not assignable to type 'D'.
diff --git a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
index 21f621604c205..f243e6e6f764e 100644
--- a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
+++ b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(10,8): error TS2322: Type 'typeof Bar' is not assignable to type 'Bar'.
-  Property 'x' is missing in type typeof Bar' but present in type 'Bar'.
+  Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(11,8): error TS2322: Type 'DateConstructor' is not assignable to type 'Date'.
   Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(17,4): error TS2345: Argument of type '() => number' is not assignable to parameter of type 'number'.
@@ -19,7 +19,7 @@ tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(2
         x: Bar,
            ~~~
 !!! error TS2322: Type 'typeof Bar' is not assignable to type 'Bar'.
-!!! error TS2322:   Property 'x' is missing in type typeof Bar' but present in type 'Bar'.
+!!! error TS2322:   Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
 !!! related TS6213 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:10:8: Did you mean to use 'new' with this expression?
         y: Date
            ~~~~
diff --git a/tests/baselines/reference/differentTypesWithSameName.errors.txt b/tests/baselines/reference/differentTypesWithSameName.errors.txt
index 6963507dd63b8..3216182ff26f1 100644
--- a/tests/baselines/reference/differentTypesWithSameName.errors.txt
+++ b/tests/baselines/reference/differentTypesWithSameName.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2737: Property 's' is missing in type variable' but present in type 'variable'.
+tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2737: Property 's' is missing in type 'variable' but present in type 'variable'.
 
 
 ==== tests/cases/compiler/differentTypesWithSameName.ts (1 errors) ====
@@ -19,4 +19,4 @@ tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2737: Propert
     var v: variable = new variable();
     m.doSomething(v);
                   ~
-!!! error TS2737: Property 's' is missing in type variable' but present in type 'variable'.
\ No newline at end of file
+!!! error TS2737: Property 's' is missing in type 'variable' but present in type 'variable'.
\ No newline at end of file
diff --git a/tests/baselines/reference/elaboratedErrors.errors.txt b/tests/baselines/reference/elaboratedErrors.errors.txt
index bdcbdd2ff395d..4757d5478d86e 100644
--- a/tests/baselines/reference/elaboratedErrors.errors.txt
+++ b/tests/baselines/reference/elaboratedErrors.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/elaboratedErrors.ts(11,3): error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'FileSystem'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/elaboratedErrors.ts(20,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-  Property 'x' is missing in type Beta' but present in type 'Alpha'.
+  Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
 tests/cases/compiler/elaboratedErrors.ts(21,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
 tests/cases/compiler/elaboratedErrors.ts(24,1): error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
-  Property 'y' is missing in type Alpha' but present in type 'Beta'.
+  Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
 tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
 
 
@@ -34,7 +34,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     x = y;
     ~
 !!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-!!! error TS2322:   Property 'x' is missing in type Beta' but present in type 'Alpha'.
+!!! error TS2322:   Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
     x = y;
     ~
 !!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
@@ -43,7 +43,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     y = x;
     ~
 !!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
-!!! error TS2322:   Property 'y' is missing in type Alpha' but present in type 'Beta'.
+!!! error TS2322:   Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
     y = x;
     ~
 !!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
diff --git a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
index b2a7a5875211b..a941fdfdda3a1 100644
--- a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
+++ b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
@@ -5,7 +5,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(14,12): error TS2322: Typ
 tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
     Type 'ctor' is not assignable to type '{ somePropA: any; }'.
-      Property 'somePropA' is missing in type ctor' but present in type '{ somePropA: any; }'.
+      Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
 
 
 ==== tests/cases/compiler/errorsWithInvokablesInUnions01.ts (2 errors) ====
@@ -34,7 +34,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Typ
 !!! error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
 !!! error TS2322:   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
 !!! error TS2322:     Type 'ctor' is not assignable to type '{ somePropA: any; }'.
-!!! error TS2322:       Property 'somePropA' is missing in type ctor' but present in type '{ somePropA: any; }'.
+!!! error TS2322:       Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
         someUnaccountedProp: any;
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
index 69194873544d9..5f1fefc852b7b 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
@@ -3,9 +3,9 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(36,5): error TS2322: Type '9.9' is not assignable to type 'Date'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(38,5): error TS2322: Type '9.9' is not assignable to type 'void'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(40,5): error TS2322: Type 'D<{}>' is not assignable to type 'I'.
-  Property 'id' is missing in type D<{}>' but present in type 'I'.
+  Property 'id' is missing in type 'D<{}>' but present in type 'I'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(41,5): error TS2322: Type 'D<{}>' is not assignable to type 'C'.
-  Property 'id' is missing in type D<{}>' but present in type 'C'.
+  Property 'id' is missing in type 'D<{}>' but present in type 'C'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(42,5): error TS2322: Type 'C' is not assignable to type 'D<string>'.
   Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(43,28): error TS2322: Type 'string' is not assignable to type 'number'.
@@ -23,7 +23,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
   Types of property 'A' are incompatible.
     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
       Type 'N.A' is not assignable to type 'M.A'.
-        Property 'name' is missing in type A' but present in type 'A'.
+        Property 'name' is missing in type 'A' but present in type 'A'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(51,5): error TS2322: Type 'N.A' is not assignable to type 'M.A'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(52,5): error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: number) => string'.
   Type 'boolean' is not assignable to type 'string'.
@@ -80,11 +80,11 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
     var anInterface: I = new D();
         ~~~~~~~~~~~
 !!! error TS2322: Type 'D<{}>' is not assignable to type 'I'.
-!!! error TS2322:   Property 'id' is missing in type D<{}>' but present in type 'I'.
+!!! error TS2322:   Property 'id' is missing in type 'D<{}>' but present in type 'I'.
     var aClass: C = new D();
         ~~~~~~
 !!! error TS2322: Type 'D<{}>' is not assignable to type 'C'.
-!!! error TS2322:   Property 'id' is missing in type D<{}>' but present in type 'C'.
+!!! error TS2322:   Property 'id' is missing in type 'D<{}>' but present in type 'C'.
     var aGenericClass: D<string> = new C();
         ~~~~~~~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D<string>'.
@@ -120,7 +120,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 !!! error TS2322:   Types of property 'A' are incompatible.
 !!! error TS2322:     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
 !!! error TS2322:       Type 'N.A' is not assignable to type 'M.A'.
-!!! error TS2322:         Property 'name' is missing in type A' but present in type 'A'.
+!!! error TS2322:         Property 'name' is missing in type 'A' but present in type 'A'.
     var aClassInModule: M.A = new N.A();
         ~~~~~~~~~~~~~~
 !!! error TS2322: Type 'N.A' is not assignable to type 'M.A'.
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
index 6e4c0962a0f06..3de40194b1026 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(11,21): error TS2322: Type
   Object literal may only specify known properties, and 'd20' does not exist in type '{ tag: "A"; a1: string; }'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(12,1): error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
   Type '{ tag: "D"; }' is not assignable to type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
-    Property 'd20' is missing in type { tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
+    Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(33,28): error TS2322: Type '{ tag: "A"; x: string; extra: number; }' is not assignable to type 'Ambiguous'.
   Object literal may only specify known properties, and 'extra' does not exist in type 'Ambiguous'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(34,26): error TS2322: Type '{ tag: "A"; y: number; extra: number; }' is not assignable to type 'Ambiguous'.
@@ -50,7 +50,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(66,9): error TS2322: Type
     ~~~~~
 !!! error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
 !!! error TS2322:   Type '{ tag: "D"; }' is not assignable to type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
-!!! error TS2322:     Property 'd20' is missing in type { tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
+!!! error TS2322:     Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
     
     type Ambiguous = {
         tag: "A",
diff --git a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
index 081bd59ec3726..c904ae15fa008 100644
--- a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
+++ b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/index.ts(10,6): error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
-tests/cases/compiler/index.ts(12,6): error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
+tests/cases/compiler/index.ts(10,6): error TS2737: Property 'foo' is missing in type '{ foob: string; }' but present in type 'IFoo'.
+tests/cases/compiler/index.ts(12,6): error TS2737: Property 'foo' is missing in type '{ foob: string; }' but present in type 'IFoo'.
 
 
 ==== tests/cases/compiler/items.ts (0 errors) ====
@@ -22,9 +22,9 @@ tests/cases/compiler/index.ts(12,6): error TS2737: Property 'foo' is missing in
     
     nFoo(q); // for comparison
          ~
-!!! error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
+!!! error TS2737: Property 'foo' is missing in type '{ foob: string; }' but present in type 'IFoo'.
     
     nFoo(B);
          ~
-!!! error TS2737: Property 'foo' is missing in type { foob: string; }' but present in type 'IFoo'.
+!!! error TS2737: Property 'foo' is missing in type '{ foob: string; }' but present in type 'IFoo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
index be0bba6d0f406..106bfe82a2c5a 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Type 'Base' is not assignable to type 'Derived'.
-  Property 'toBase' is missing in type Base' but present in type 'Derived'.
+  Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
 
 
 ==== tests/cases/compiler/fixingTypeParametersRepeatedly2.ts (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Ty
     var result = foo(derived, d => d.toBase());
                                    ~~~~~~~~~~
 !!! error TS2322: Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:   Property 'toBase' is missing in type Base' but present in type 'Derived'.
+!!! error TS2322:   Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
 !!! 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.
diff --git a/tests/baselines/reference/for-of31.errors.txt b/tests/baselines/reference/for-of31.errors.txt
index 087556d87c97e..2a85abc561dc5 100644
--- a/tests/baselines/reference/for-of31.errors.txt
+++ b/tests/baselines/reference/for-of31.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
         Types of property 'next' are incompatible.
           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
             Type '{ value: string; }' is not assignable to type 'IteratorResult<string>'.
-              Property 'done' is missing in type { value: string; }' but present in type 'IteratorResult<string>'.
+              Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
 
 
 ==== tests/cases/conformance/es6/for-ofStatements/for-of31.ts (1 errors) ====
@@ -31,4 +31,4 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
 !!! error TS2322:             Type '{ value: string; }' is not assignable to type 'IteratorResult<string>'.
-!!! error TS2322:               Property 'done' is missing in type { value: string; }' but present in type 'IteratorResult<string>'.
\ No newline at end of file
+!!! error TS2322:               Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads41.errors.txt b/tests/baselines/reference/functionOverloads41.errors.txt
index bf5cac4ea481e..92e4c6fcf8740 100644
--- a/tests/baselines/reference/functionOverloads41.errors.txt
+++ b/tests/baselines/reference/functionOverloads41.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
-  Property 'a' is missing in type {}' but present in type '{ a: boolean; }'.
+  Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
 
 
 ==== tests/cases/compiler/functionOverloads41.ts (1 errors) ====
@@ -9,5 +9,5 @@ tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is no
     var x = foo([{}]);
                  ~~
 !!! error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
-!!! error TS2322:   Property 'a' is missing in type {}' but present in type '{ a: boolean; }'.
+!!! error TS2322:   Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index bb967723d0e8f..fddbdfb571468 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/fuzzy.ts(13,18): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property 'alsoWorks' is missing in type C' but present in type 'I'.
+  Property 'alsoWorks' is missing in type 'C' but present in type 'I'.
 tests/cases/compiler/fuzzy.ts(21,34): error TS2322: Type 'this' is not assignable to type 'I'.
   Type 'C' is not assignable to type 'I'.
-tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missing in type { oneI: this; }' but present in type 'R'.
+tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missing in type '{ oneI: this; }' but present in type 'R'.
 
 
 ==== tests/cases/compiler/fuzzy.ts (3 errors) ====
@@ -21,7 +21,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missi
         export class C implements I {
                      ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'alsoWorks' is missing in type C' but present in type 'I'.
+!!! error TS2420:   Property 'alsoWorks' is missing in type 'C' but present in type 'I'.
             constructor(public x:number) {
             }
             works():R {
@@ -39,7 +39,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missi
             worksToo():R {
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'anything' is missing in type { oneI: this; }' but present in type 'R'.
+!!! error TS2737: Property 'anything' is missing in type '{ oneI: this; }' but present in type 'R'.
             }
         }
     }
diff --git a/tests/baselines/reference/generatorTypeCheck18.errors.txt b/tests/baselines/reference/generatorTypeCheck18.errors.txt
index 774c4a410088a..91a67a4cde87e 100644
--- a/tests/baselines/reference/generatorTypeCheck18.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck18.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-  Property 'x' is missing in type Baz' but present in type 'Foo'.
+  Property 'x' is missing in type 'Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): erro
         yield new Baz;
               ~~~~~~~
 !!! error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'x' is missing in type Baz' but present in type 'Foo'.
+!!! error TS2322:   Property 'x' is missing in type 'Baz' but present in type 'Foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck20.errors.txt b/tests/baselines/reference/generatorTypeCheck20.errors.txt
index b7b16e66fba51..6b53b658059aa 100644
--- a/tests/baselines/reference/generatorTypeCheck20.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck20.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-  Property 'x' is missing in type Baz' but present in type 'Foo'.
+  Property 'x' is missing in type 'Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): erro
         yield * [new Baz];
                 ~~~~~~~~~
 !!! error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'x' is missing in type Baz' but present in type 'Foo'.
+!!! error TS2322:   Property 'x' is missing in type 'Baz' but present in type 'Foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck25.errors.txt b/tests/baselines/reference/generatorTypeCheck25.errors.txt
index f4de562f4e0fd..35062c4bfaccf 100644
--- a/tests/baselines/reference/generatorTypeCheck25.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck25.errors.txt
@@ -8,7 +8,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
                 Type 'Bar | Baz' is not assignable to type 'Foo'.
                   Type 'Baz' is not assignable to type 'Foo'.
-                    Property 'x' is missing in type Baz' but present in type 'Foo'.
+                    Property 'x' is missing in type 'Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts (1 errors) ====
@@ -27,7 +27,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
 !!! error TS2322:               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
 !!! error TS2322:                 Type 'Bar | Baz' is not assignable to type 'Foo'.
 !!! error TS2322:                   Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:                     Property 'x' is missing in type Baz' but present in type 'Foo'.
+!!! error TS2322:                     Property 'x' is missing in type 'Baz' but present in type 'Foo'.
         yield;
         yield new Bar;
         yield new Baz;
diff --git a/tests/baselines/reference/generatorTypeCheck7.errors.txt b/tests/baselines/reference/generatorTypeCheck7.errors.txt
index 23de46a05f610..e4655e8267f60 100644
--- a/tests/baselines/reference/generatorTypeCheck7.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error TS2322: Type 'IterableIterator<number>' is not assignable to type 'WeirdIter'.
-  Property 'hello' is missing in type IterableIterator<number>' but present in type 'WeirdIter'.
+  Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts (1 errors) ====
@@ -9,4 +9,4 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error
     function* g1(): WeirdIter { }
                     ~~~~~~~~~
 !!! error TS2322: Type 'IterableIterator<number>' is not assignable to type 'WeirdIter'.
-!!! error TS2322:   Property 'hello' is missing in type IterableIterator<number>' but present in type 'WeirdIter'.
\ No newline at end of file
+!!! error TS2322:   Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
index c1a1305a6a59c..8a2b5778737e3 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts(18,32): error TS2322: Type 'Derived2' is not assignable to type 'Derived'.
-  Property 'y' is missing in type Derived2' but present in type 'Derived'.
+  Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts (1 errors) ====
@@ -23,7 +23,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other
                                    ~
 !!! error TS2322: Type 'Derived2' is not assignable to type 'Derived'.
-!!! error TS2322:   Property 'y' is missing in type Derived2' but present in type 'Derived'.
+!!! error TS2322:   Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
 !!! related TS6500 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts:13:39: The expected type comes from property 'y' which is declared here on type '{ x: Derived; y: Derived; }'
     
     function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
index 3aa1a8158a72c..ae4bd4ebf625f 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2737: Property 'y' is missing in type C' but present in type 'D'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2737: Property 'y' is missing in type 'C' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'.
 
 
@@ -23,7 +23,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r = foo(c, d);
     var r2 = foo(d, c); // error because C does not extend D
                     ~
-!!! error TS2737: Property 'y' is missing in type C' but present in type 'D'.
+!!! error TS2737: Property 'y' is missing in type 'C' but present in type 'D'.
     var r3 = foo(c, { x: '', foo: c });
     var r4 = foo(null, null);
     var r5 = foo({}, null);
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
index b37127522f8cb..3b6012e4d704d 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2737: Property 'y' is missing in type C' but present in type 'D'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2737: Property 'y' is missing in type 'C' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(19,23): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
   Type 'void' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'.
@@ -24,7 +24,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var d: D;
     var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
                     ~
-!!! error TS2737: Property 'y' is missing in type C' but present in type 'D'.
+!!! error TS2737: Property 'y' is missing in type 'C' but present in type 'D'.
     var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
                           ~~~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
diff --git a/tests/baselines/reference/genericCallWithTupleType.errors.txt b/tests/baselines/reference/genericCallWithTupleType.errors.txt
index 62c8c208b5a23..c1f3f7af4f793 100644
--- a/tests/baselines/reference/genericCallWithTupleType.errors.txt
+++ b/tests/baselines/reference/genericCallWithTupleType.errors.txt
@@ -10,7 +10,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,14): error TS2322: Type '{}' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,18): error TS2322: Type '{}' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(24,1): error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
-  Property '1' is missing in type [{}]' but present in type '[{}, {}]'.
+  Property '1' is missing in type '[{}]' but present in type '[{}, {}]'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts (10 errors) ====
@@ -60,5 +60,5 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
     i2.tuple1 = [{}];
     ~~~~~~~~~
 !!! error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
-!!! error TS2322:   Property '1' is missing in type [{}]' but present in type '[{}, {}]'.
+!!! error TS2322:   Property '1' is missing in type '[{}]' but present in type '[{}, {}]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericConstraint2.errors.txt b/tests/baselines/reference/genericConstraint2.errors.txt
index f0d4866cb3d84..79efd14208932 100644
--- a/tests/baselines/reference/genericConstraint2.errors.txt
+++ b/tests/baselines/reference/genericConstraint2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/genericConstraint2.ts(11,7): error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable<string>'.
-  Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<string>'.
-tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<ComparableString>'.
+  Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<string>'.
+tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<ComparableString>'.
 
 
 ==== tests/cases/compiler/genericConstraint2.ts (2 errors) ====
@@ -17,7 +17,7 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'compa
     class ComparableString implements Comparable<string>{
           ~~~~~~~~~~~~~~~~
 !!! error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable<string>'.
-!!! error TS2420:   Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<string>'.
+!!! error TS2420:   Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<string>'.
         constructor(public currentValue: string) { }
     
         localeCompare(other) {
@@ -29,4 +29,4 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'compa
     var b = new ComparableString("b");
     var c = compare<ComparableString>(a, b);
                     ~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'comparer' is missing in type ComparableString' but present in type 'Comparable<ComparableString>'.
\ No newline at end of file
+!!! error TS2737: Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<ComparableString>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericRestParameters2.errors.txt b/tests/baselines/reference/genericRestParameters2.errors.txt
index 2fd6309b30064..3ead62cfc11f6 100644
--- a/tests/baselines/reference/genericRestParameters2.errors.txt
+++ b/tests/baselines/reference/genericRestParameters2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/rest/genericRestParameters2.ts(71,40): error TS2344: Type '(x: string, ...args: T) => void' does not satisfy the constraint '(...args: any[]) => any'.
   Types of parameters 'x' and 'args' are incompatible.
-    Property '0' is missing in type any[]' but present in type '[string, ...any[]]'.
+    Property '0' is missing in type 'any[]' but present in type '[string, ...any[]]'.
 
 
 ==== tests/cases/conformance/types/rest/genericRestParameters2.ts (1 errors) ====
@@ -78,7 +78,7 @@ tests/cases/conformance/types/rest/genericRestParameters2.ts(71,40): error TS234
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2344: Type '(x: string, ...args: T) => void' does not satisfy the constraint '(...args: any[]) => any'.
 !!! error TS2344:   Types of parameters 'x' and 'args' are incompatible.
-!!! error TS2344:     Property '0' is missing in type any[]' but present in type '[string, ...any[]]'.
+!!! error TS2344:     Property '0' is missing in type 'any[]' but present in type '[string, ...any[]]'.
     type T06 = T05<[number, ...boolean[]]>;
     
     type P1<T extends Function> = T extends (head: infer A, ...tail: infer B) => any ? { head: A, tail: B } : any[];
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index 4d46b38970501..a263841f858cd 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -14,20 +14,20 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(18,1): error TS2322
   Types of parameters 'y' and 'args' are incompatible.
     Type '[string] | [number, boolean]' is not assignable to type '[number, boolean]'.
       Type '[string]' is not assignable to type '[number, boolean]'.
-        Property '1' is missing in type [string]' but present in type '[number, boolean]'.
+        Property '1' is missing in type '[string]' but present in type '[number, boolean]'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(19,1): error TS2322: Type '(...args: [string, string] | [string, number, boolean]) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(29,1): error TS2554: Expected 1 arguments, but got 0.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(30,21): error TS2345: Argument of type '100' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(31,21): error TS2345: Argument of type '<T extends any[]>(cb: (...args: T) => void) => void' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
   Types of parameters 'cb' and 'args' are incompatible.
-    Property '0' is missing in type CoolArray<any>' but present in type '[(...args: any[]) => void]'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(38,32): error TS2737: Property 'hello' is missing in type [10, 20]' but present in type 'CoolArray<number>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(43,1): error TS2737: Property 'hello' is missing in type []' but present in type 'CoolArray<never>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(44,5): error TS2737: Property 'hello' is missing in type [number]' but present in type 'CoolArray<{}>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(45,5): error TS2737: Property 'hello' is missing in type [number, number]' but present in type 'CoolArray<{}>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(46,5): error TS2737: Property 'hello' is missing in type number[]' but present in type 'CoolArray<number>'.
+    Property '0' is missing in type 'CoolArray<any>' but present in type '[(...args: any[]) => void]'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(38,32): error TS2737: Property 'hello' is missing in type '[10, 20]' but present in type 'CoolArray<number>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(43,1): error TS2737: Property 'hello' is missing in type '[]' but present in type 'CoolArray<never>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(44,5): error TS2737: Property 'hello' is missing in type '[number]' but present in type 'CoolArray<{}>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(45,5): error TS2737: Property 'hello' is missing in type '[number, number]' but present in type 'CoolArray<{}>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(46,5): error TS2737: Property 'hello' is missing in type 'number[]' but present in type 'CoolArray<number>'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345: Argument of type '["what"]' is not assignable to parameter of type '[] | [number, string]'.
-  Property '1' is missing in type ["what"]' but present in type '[number, string]'.
+  Property '1' is missing in type '["what"]' but present in type '[number, string]'.
 
 
 ==== tests/cases/conformance/types/rest/genericRestParameters3.ts (15 errors) ====
@@ -70,7 +70,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
 !!! error TS2322:   Types of parameters 'y' and 'args' are incompatible.
 !!! error TS2322:     Type '[string] | [number, boolean]' is not assignable to type '[number, boolean]'.
 !!! error TS2322:       Type '[string]' is not assignable to type '[number, boolean]'.
-!!! error TS2322:         Property '1' is missing in type [string]' but present in type '[number, boolean]'.
+!!! error TS2322:         Property '1' is missing in type '[string]' but present in type '[number, boolean]'.
     f1 = f4;  // Error, misaligned complex rest types
     ~~
 !!! error TS2322: Type '(...args: [string, string] | [string, number, boolean]) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
@@ -94,7 +94,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
                         ~~~
 !!! error TS2345: Argument of type '<T extends any[]>(cb: (...args: T) => void) => void' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
 !!! error TS2345:   Types of parameters 'cb' and 'args' are incompatible.
-!!! error TS2345:     Property '0' is missing in type CoolArray<any>' but present in type '[(...args: any[]) => void]'.
+!!! error TS2345:     Property '0' is missing in type 'CoolArray<any>' but present in type '[(...args: any[]) => void]'.
     
     function bar<T extends any[]>(...args: T): T {
         return args;
@@ -103,23 +103,23 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     let a = bar(10, 20);
     let b = bar<CoolArray<number>>(10, 20);  // Error
                                    ~~
-!!! error TS2737: Property 'hello' is missing in type [10, 20]' but present in type 'CoolArray<number>'.
+!!! error TS2737: Property 'hello' is missing in type '[10, 20]' but present in type 'CoolArray<number>'.
     
     declare function baz<T>(...args: CoolArray<T>): void;
     declare const ca: CoolArray<number>;
     
     baz();       // Error
     ~~~~~
-!!! error TS2737: Property 'hello' is missing in type []' but present in type 'CoolArray<never>'.
+!!! error TS2737: Property 'hello' is missing in type '[]' but present in type 'CoolArray<never>'.
     baz(1);      // Error
         ~
-!!! error TS2737: Property 'hello' is missing in type [number]' but present in type 'CoolArray<{}>'.
+!!! error TS2737: Property 'hello' is missing in type '[number]' but present in type 'CoolArray<{}>'.
     baz(1, 2);   // Error
         ~
-!!! error TS2737: Property 'hello' is missing in type [number, number]' but present in type 'CoolArray<{}>'.
+!!! error TS2737: Property 'hello' is missing in type '[number, number]' but present in type 'CoolArray<{}>'.
     baz(...ca);  // Error
         ~~~~~
-!!! error TS2737: Property 'hello' is missing in type number[]' but present in type 'CoolArray<number>'.
+!!! error TS2737: Property 'hello' is missing in type 'number[]' but present in type 'CoolArray<number>'.
     
     // Repro from #26491
     
@@ -129,5 +129,5 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     hmm("what"); // no error?  A = [] | [number, string] ?
         ~~~~~~
 !!! error TS2345: Argument of type '["what"]' is not assignable to parameter of type '[] | [number, string]'.
-!!! error TS2345:   Property '1' is missing in type ["what"]' but present in type '[number, string]'.
+!!! error TS2345:   Property '1' is missing in type '["what"]' but present in type '[number, string]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions2.errors.txt b/tests/baselines/reference/genericTypeAssertions2.errors.txt
index 72c3dac76e568..242ba3a7d3c3d 100644
--- a/tests/baselines/reference/genericTypeAssertions2.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions2.errors.txt
@@ -4,8 +4,8 @@ tests/cases/compiler/genericTypeAssertions2.ts(10,5): error TS2322: Type 'B<stri
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericTypeAssertions2.ts(11,5): error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
-  Property 'bar' is missing in type A<number>' but present in type 'B<number>'.
-tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'foo' is missing in type undefined[]' but present in type 'A<number>'.
+  Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
+tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'foo' is missing in type 'undefined[]' but present in type 'A<number>'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions2.ts (3 errors) ====
@@ -28,8 +28,8 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'f
     var r3: B<number> = <A<number>>new B(); // error
         ~~
 !!! error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
-!!! error TS2322:   Property 'bar' is missing in type A<number>' but present in type 'B<number>'.
+!!! error TS2322:   Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
     var r4: A<number> = <A<number>>new A();
     var r5: A<number> = <A<number>>[]; // error
                         ~~~~~~~~~~~~~
-!!! error TS2737: Property 'foo' is missing in type undefined[]' but present in type 'A<number>'.
\ No newline at end of file
+!!! error TS2737: Property 'foo' is missing in type 'undefined[]' but present in type 'A<number>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeConstraints.errors.txt b/tests/baselines/reference/genericTypeConstraints.errors.txt
index 58f72105a9307..a760c7125f2f0 100644
--- a/tests/baselines/reference/genericTypeConstraints.errors.txt
+++ b/tests/baselines/reference/genericTypeConstraints.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2737: Property 'fooMethod' is missing in type FooExtended' but present in type 'Foo'.
+tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2737: Property 'fooMethod' is missing in type 'FooExtended' but present in type 'Foo'.
 
 
 ==== tests/cases/compiler/genericTypeConstraints.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2737: Property 'fo
     
     class BarExtended extends Bar<FooExtended> {
                                   ~~~~~~~~~~~
-!!! error TS2737: Property 'fooMethod' is missing in type FooExtended' but present in type 'Foo'.
+!!! error TS2737: Property 'fooMethod' is missing in type 'FooExtended' but present in type 'Foo'.
         constructor() {
             super();
         }
diff --git a/tests/baselines/reference/generics1.errors.txt b/tests/baselines/reference/generics1.errors.txt
index 3547117b35d71..344db160b202f 100644
--- a/tests/baselines/reference/generics1.errors.txt
+++ b/tests/baselines/reference/generics1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/generics1.ts(10,14): error TS2737: Property 'b' is missing in type A' but present in type 'B'.
+tests/cases/compiler/generics1.ts(10,14): error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/generics1.ts(13,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 
@@ -15,7 +15,7 @@ tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' re
     var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2737: Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
     var v6: G<any>;                // Error, wrong number of arguments
diff --git a/tests/baselines/reference/generics2.errors.txt b/tests/baselines/reference/generics2.errors.txt
index 6183398eb4f77..be60df1b6d306 100644
--- a/tests/baselines/reference/generics2.errors.txt
+++ b/tests/baselines/reference/generics2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/generics2.ts(17,14): error TS2737: Property 'b' is missing in type A' but present in type 'B'.
+tests/cases/compiler/generics2.ts(17,14): error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/generics2.ts(20,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 
@@ -22,7 +22,7 @@ tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' re
     var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2737: Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
     var v6: G<any>;                // Error, wrong number of arguments
diff --git a/tests/baselines/reference/generics5.errors.txt b/tests/baselines/reference/generics5.errors.txt
index bdbd5914eea5b..6e48de4c66af1 100644
--- a/tests/baselines/reference/generics5.errors.txt
+++ b/tests/baselines/reference/generics5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/generics5.ts(10,14): error TS2737: Property 'b' is missing in type A' but present in type 'B'.
+tests/cases/compiler/generics5.ts(10,14): error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/generics5.ts (1 errors) ====
@@ -13,6 +13,6 @@ tests/cases/compiler/generics5.ts(10,14): error TS2737: Property 'b' is missing
     
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2737: Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
index 7eb94af6d907a..43ec772b17fff 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(9,7): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
   Type 'Bar' is missing the following properties from type 'I': y, x
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(12,7): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'x' is missing in type Bar2' but present in type 'I'.
+  Property 'x' is missing in type 'Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(16,7): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
   Property 'x' is private in type 'I' but not in type 'Bar3'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts(21,7): error TS2420: Class 'Bar4' incorrectly implements interface 'I'.
@@ -26,7 +26,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
     class Bar2 implements I { // error
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'x' is missing in type Bar2' but present in type 'I'.
+!!! error TS2420:   Property 'x' is missing in type 'Bar2' but present in type 'I'.
         y: number;
     }
     
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
index bed2955ce6cdf..e3fecc218f8ab 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
@@ -9,23 +9,23 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(42,11): error TS2415: Class 'Bar2' incorrectly extends base class 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(42,11): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'z' is missing in type Bar2' but present in type 'I'.
+  Property 'z' is missing in type 'Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(47,11): error TS2415: Class 'Bar3' incorrectly extends base class 'Foo'.
   Types have separate declarations of a private property 'x'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(47,11): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-  Property 'z' is missing in type Bar3' but present in type 'I'.
+  Property 'z' is missing in type 'Bar3' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(67,11): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-  Property 'y' is missing in type Bar' but present in type 'I'.
+  Property 'y' is missing in type 'Bar' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(73,16): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(74,16): error TS2339: Property 'y' does not exist on type 'Bar'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(76,11): error TS2415: Class 'Bar2' incorrectly extends base class 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(76,11): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'y' is missing in type Bar2' but present in type 'I'.
+  Property 'y' is missing in type 'Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2415: Class 'Bar3' incorrectly extends base class 'Foo'.
   Types have separate declarations of a private property 'x'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-  Property 'y' is missing in type Bar3' but present in type 'I'.
+  Property 'y' is missing in type 'Bar3' but present in type 'I'.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts (15 errors) ====
@@ -88,7 +88,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
               ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'z' is missing in type Bar2' but present in type 'I'.
+!!! error TS2420:   Property 'z' is missing in type 'Bar2' but present in type 'I'.
             x: string;
             y: number;
         }
@@ -99,7 +99,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Types have separate declarations of a private property 'x'.
               ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'z' is missing in type Bar3' but present in type 'I'.
+!!! error TS2420:   Property 'z' is missing in type 'Bar3' but present in type 'I'.
             private x: string;
             y: number;
         }
@@ -122,7 +122,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
         class Bar extends Foo implements I { // error
               ~~~
 !!! error TS2420: Class 'Bar' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type Bar' but present in type 'I'.
+!!! error TS2420:   Property 'y' is missing in type 'Bar' but present in type 'I'.
             z: number;
         }
     
@@ -141,7 +141,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
               ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type Bar2' but present in type 'I'.
+!!! error TS2420:   Property 'y' is missing in type 'Bar2' but present in type 'I'.
             x: string;
             z: number;
         }
@@ -152,7 +152,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
 !!! error TS2415:   Types have separate declarations of a private property 'x'.
               ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type Bar3' but present in type 'I'.
+!!! error TS2420:   Property 'y' is missing in type 'Bar3' but present in type 'I'.
             private x: string;
             z: number;
         }
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
index 7f5e6617d9200..316463122443c 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(9,7): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
   Type 'Bar' is missing the following properties from type 'I': y, x
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(12,7): error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-  Property 'x' is missing in type Bar2' but present in type 'I'.
+  Property 'x' is missing in type 'Bar2' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(16,7): error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
   Property 'x' is protected but type 'Bar3' is not a class derived from 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(21,7): error TS2420: Class 'Bar4' incorrectly implements interface 'I'.
   Property 'x' is protected but type 'Bar4' is not a class derived from 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(26,7): error TS2420: Class 'Bar5' incorrectly implements interface 'I'.
-  Property 'y' is missing in type Bar5' but present in type 'I'.
+  Property 'y' is missing in type 'Bar5' but present in type 'I'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(29,7): error TS2420: Class 'Bar6' incorrectly implements interface 'I'.
   Property 'y' is protected in type 'Bar6' but public in type 'I'.
 
@@ -30,7 +30,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
     class Bar2 implements I { // error
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'x' is missing in type Bar2' but present in type 'I'.
+!!! error TS2420:   Property 'x' is missing in type 'Bar2' but present in type 'I'.
         y: number;
     }
     
@@ -53,7 +53,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
     class Bar5 extends Foo implements I { // error
           ~~~~
 !!! error TS2420: Class 'Bar5' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'y' is missing in type Bar5' but present in type 'I'.
+!!! error TS2420:   Property 'y' is missing in type 'Bar5' but present in type 'I'.
     }
     
     class Bar6 extends Foo implements I { // error
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
index 16cb707ca9b8b..1258759923620 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-    Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+    Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
 tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+  Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
 
 
 ==== tests/cases/conformance/dynamicImport/anotherModule.ts (0 errors) ====
@@ -19,10 +19,10 @@ tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of ty
         ~~
 !!! error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
 !!! error TS2322:   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-!!! error TS2322:     Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! error TS2322:     Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
     let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'D' is missing in type typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! error TS2352:   Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
     let p3: Promise<any> = import("./defaultPath");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inheritance1.errors.txt b/tests/baselines/reference/inheritance1.errors.txt
index 1fa269862aafe..3085b31b3c215 100644
--- a/tests/baselines/reference/inheritance1.errors.txt
+++ b/tests/baselines/reference/inheritance1.errors.txt
@@ -1,27 +1,27 @@
 tests/cases/compiler/inheritance1.ts(14,7): error TS2420: Class 'ImageBase' incorrectly implements interface 'SelectableControl'.
-  Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
+  Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(18,7): error TS2420: Class 'Locations' incorrectly implements interface 'SelectableControl'.
-  Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
+  Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(31,1): error TS2322: Type 'Control' is not assignable to type 'Button'.
-  Property 'select' is missing in type Control' but present in type 'Button'.
+  Property 'select' is missing in type 'Control' but present in type 'Button'.
 tests/cases/compiler/inheritance1.ts(37,1): error TS2322: Type 'Control' is not assignable to type 'TextBox'.
-  Property 'select' is missing in type Control' but present in type 'TextBox'.
+  Property 'select' is missing in type 'Control' but present in type 'TextBox'.
 tests/cases/compiler/inheritance1.ts(40,1): error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
-  Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
+  Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(46,1): error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
-  Property 'select' is missing in type Image1' but present in type 'SelectableControl'.
+  Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(52,1): error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
-  Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
+  Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(53,1): error TS2322: Type 'Locations' is not assignable to type 'Control'.
-  Property 'state' is missing in type Locations' but present in type 'Control'.
+  Property 'state' is missing in type 'Locations' but present in type 'Control'.
 tests/cases/compiler/inheritance1.ts(55,1): error TS2322: Type 'Control' is not assignable to type 'Locations'.
-  Property 'select' is missing in type Control' but present in type 'Locations'.
+  Property 'select' is missing in type 'Control' but present in type 'Locations'.
 tests/cases/compiler/inheritance1.ts(58,1): error TS2322: Type 'Locations1' is not assignable to type 'SelectableControl'.
-  Property 'state' is missing in type Locations1' but present in type 'SelectableControl'.
+  Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(59,1): error TS2322: Type 'Locations1' is not assignable to type 'Control'.
-  Property 'state' is missing in type Locations1' but present in type 'Control'.
+  Property 'state' is missing in type 'Locations1' but present in type 'Control'.
 tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not assignable to type 'Locations1'.
-  Property 'select' is missing in type Control' but present in type 'Locations1'.
+  Property 'select' is missing in type 'Control' but present in type 'Locations1'.
 
 
 ==== tests/cases/compiler/inheritance1.ts (12 errors) ====
@@ -41,14 +41,14 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     class ImageBase extends Control implements SelectableControl{
           ~~~~~~~~~
 !!! error TS2420: Class 'ImageBase' incorrectly implements interface 'SelectableControl'.
-!!! error TS2420:   Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
+!!! error TS2420:   Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
     }
     class Image1 extends Control {
     }
     class Locations implements SelectableControl {
           ~~~~~~~~~
 !!! error TS2420: Class 'Locations' incorrectly implements interface 'SelectableControl'.
-!!! error TS2420:   Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
+!!! error TS2420:   Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
         select() { }
     }
     class Locations1 {
@@ -64,7 +64,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     b = c;
     ~
 !!! error TS2322: Type 'Control' is not assignable to type 'Button'.
-!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'Button'.
+!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'Button'.
     
     var t: TextBox;
     sc = t;
@@ -73,13 +73,13 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     t = c;
     ~
 !!! error TS2322: Type 'Control' is not assignable to type 'TextBox'.
-!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'TextBox'.
+!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'TextBox'.
     
     var i: ImageBase;
     sc = i;
     ~~
 !!! error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'select' is missing in type ImageBase' but present in type 'SelectableControl'.
+!!! error TS2322:   Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
     c = i;
     i = sc;
     i = c;
@@ -88,7 +88,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     sc = i1;
     ~~
 !!! error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'select' is missing in type Image1' but present in type 'SelectableControl'.
+!!! error TS2322:   Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
     c = i1;
     i1 = sc;
     i1 = c;
@@ -97,28 +97,28 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     sc = l;
     ~~
 !!! error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'state' is missing in type Locations' but present in type 'SelectableControl'.
+!!! error TS2322:   Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
     c = l;
     ~
 !!! error TS2322: Type 'Locations' is not assignable to type 'Control'.
-!!! error TS2322:   Property 'state' is missing in type Locations' but present in type 'Control'.
+!!! error TS2322:   Property 'state' is missing in type 'Locations' but present in type 'Control'.
     l = sc;
     l = c;
     ~
 !!! error TS2322: Type 'Control' is not assignable to type 'Locations'.
-!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'Locations'.
+!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'Locations'.
     
     var l1: Locations1;
     sc = l1;
     ~~
 !!! error TS2322: Type 'Locations1' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'state' is missing in type Locations1' but present in type 'SelectableControl'.
+!!! error TS2322:   Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
     c = l1;
     ~
 !!! error TS2322: Type 'Locations1' is not assignable to type 'Control'.
-!!! error TS2322:   Property 'state' is missing in type Locations1' but present in type 'Control'.
+!!! error TS2322:   Property 'state' is missing in type 'Locations1' but present in type 'Control'.
     l1 = sc;
     l1 = c;
     ~~
 !!! error TS2322: Type 'Control' is not assignable to type 'Locations1'.
-!!! error TS2322:   Property 'select' is missing in type Control' but present in type 'Locations1'.
\ No newline at end of file
+!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'Locations1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
index b316320524680..7421b2a1a72c5 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
@@ -1,16 +1,16 @@
 tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-  Property '__predomBrand' is missing in type Element' but present in type 'Element'.
+  Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
 tests/cases/conformance/jsx/inline/index.tsx(21,22): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2737: Property '__domBrand' is missing in type MyClass' but present in type 'ElementClass'.
+tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2737: Property '__domBrand' is missing in type 'MyClass' but present in type 'ElementClass'.
 tests/cases/conformance/jsx/inline/index.tsx(21,63): error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
 tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
       Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
-        Property '__domBrand' is missing in type Element' but present in type 'Element'.
+        Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
 
 
 ==== tests/cases/conformance/jsx/inline/renderer.d.ts (0 errors) ====
@@ -81,7 +81,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
     elem = <h></h>; // Expect assignability error here
     ~~~~
 !!! error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-!!! error TS2322:   Property '__predomBrand' is missing in type Element' but present in type 'Element'.
+!!! error TS2322:   Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
     
     const DOMSFC = (props: {x: number, y: number, children?: dom.JSX.Element[]}) => <p>{props.x} + {props.y} = {props.x + props.y}{props.children}</p>;
     
@@ -104,7 +104,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
 !!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property '__domBrand' is missing in type MyClass' but present in type 'ElementClass'.
+!!! error TS2737: Property '__domBrand' is missing in type 'MyClass' but present in type 'ElementClass'.
                                                                   ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
     
@@ -115,5 +115,5 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:   Types of property 'children' are incompatible.
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
 !!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
-!!! error TS2322:         Property '__domBrand' is missing in type Element' but present in type 'Element'.
+!!! error TS2322:         Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
index 229072931d732..813e72006e322 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-  Property '__predomBrand' is missing in type Element' but present in type 'Element'.
+  Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
 
 
 ==== tests/cases/conformance/jsx/inline/renderer.d.ts (0 errors) ====
@@ -47,5 +47,5 @@ tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'JSX.Eleme
     elem = <h></h>; // Expect assignability error here
     ~~~~
 !!! error TS2322: Type 'JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-!!! error TS2322:   Property '__predomBrand' is missing in type Element' but present in type 'Element'.
+!!! error TS2322:   Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
index 25f5ea06f4d7d..2b2e686791fe9 100644
--- a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/interfaceAssignmentCompat.ts(32,18): error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
   Types of parameters 'a' and 'a' are incompatible.
-    Property 'coleur' is missing in type IEye' but present in type 'IFrenchEye'.
+    Property 'coleur' is missing in type 'IEye' but present in type 'IFrenchEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(37,29): error TS2339: Property '_map' does not exist on type 'typeof Color'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(42,13): error TS2322: Type 'IEye' is not assignable to type 'IFrenchEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEye[]' is not assignable to type 'IFrenchEye[]'.
@@ -43,7 +43,7 @@ tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEy
                      ~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
 !!! error TS2345:   Types of parameters 'a' and 'a' are incompatible.
-!!! error TS2345:     Property 'coleur' is missing in type IEye' but present in type 'IFrenchEye'.
+!!! error TS2345:     Property 'coleur' is missing in type 'IEye' but present in type 'IFrenchEye'.
             // type of z inferred from specialized array type
             var z=x.sort(CompareEyes); // ok
     
diff --git a/tests/baselines/reference/interfaceDeclaration1.errors.txt b/tests/baselines/reference/interfaceDeclaration1.errors.txt
index caf17d04df8b3..e8fc605a26be7 100644
--- a/tests/baselines/reference/interfaceDeclaration1.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration1.errors.txt
@@ -5,7 +5,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(8,5): error TS2300: Duplicate iden
 tests/cases/compiler/interfaceDeclaration1.ts(8,5): error TS2717: Subsequent property declarations must have the same type.  Property 'item' must be of type 'any', but here has type 'number'.
 tests/cases/compiler/interfaceDeclaration1.ts(22,11): error TS2310: Type 'I5' recursively references itself as a base type.
 tests/cases/compiler/interfaceDeclaration1.ts(35,7): error TS2420: Class 'C1' incorrectly implements interface 'I3'.
-  Property 'prototype' is missing in type C1' but present in type 'I3'.
+  Property 'prototype' is missing in type 'C1' but present in type 'I3'.
 tests/cases/compiler/interfaceDeclaration1.ts(41,11): error TS2310: Type 'i8' recursively references itself as a base type.
 tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i12' cannot simultaneously extend types 'i10' and 'i11'.
   Named property 'foo' of types 'i10' and 'i11' are not identical.
@@ -61,7 +61,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i
     class C1 implements I3 {
           ~~
 !!! error TS2420: Class 'C1' incorrectly implements interface 'I3'.
-!!! error TS2420:   Property 'prototype' is missing in type C1' but present in type 'I3'.
+!!! error TS2420:   Property 'prototype' is missing in type 'C1' but present in type 'I3'.
         constructor() {
             var prototype: number = 3;
         }
diff --git a/tests/baselines/reference/interfaceDeclaration4.errors.txt b/tests/baselines/reference/interfaceDeclaration4.errors.txt
index 7fea572f06cc4..c3f01806b7224 100644
--- a/tests/baselines/reference/interfaceDeclaration4.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration4.errors.txt
@@ -2,9 +2,9 @@ tests/cases/compiler/interfaceDeclaration4.ts(18,11): error TS2430: Interface 'I
   Types of property 'item' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/interfaceDeclaration4.ts(27,7): error TS2420: Class 'C2' incorrectly implements interface 'I4'.
-  Property 'item' is missing in type C2' but present in type 'I4'.
+  Property 'item' is missing in type 'C2' but present in type 'I4'.
 tests/cases/compiler/interfaceDeclaration4.ts(36,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-  Property 'item' is missing in type C3' but present in type 'I1'.
+  Property 'item' is missing in type 'C3' but present in type 'I1'.
 tests/cases/compiler/interfaceDeclaration4.ts(39,14): error TS1005: '{' expected.
 tests/cases/compiler/interfaceDeclaration4.ts(39,15): error TS2304: Cannot find name 'I1'.
 tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected.
@@ -44,7 +44,7 @@ tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected
     class C2 implements I4 {
           ~~
 !!! error TS2420: Class 'C2' incorrectly implements interface 'I4'.
-!!! error TS2420:   Property 'item' is missing in type C2' but present in type 'I4'.
+!!! error TS2420:   Property 'item' is missing in type 'C2' but present in type 'I4'.
         public token: string;
     }
     
@@ -56,7 +56,7 @@ tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected
     class C3 implements Foo.I1 { }
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'item' is missing in type C3' but present in type 'I1'.
+!!! error TS2420:   Property 'item' is missing in type 'C3' but present in type 'I1'.
     
     // Negative case 
     interface Foo.I1 { }
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
index dd39debd6fbfb..b5d6baa1d2d93 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(21,1): error TS2322: Type 'C' is not assignable to type 'I'.
-  Property 'other' is missing in type C' but present in type 'I'.
+  Property 'other' is missing in type 'C' but present in type 'I'.
 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(24,1): error TS2322: Type 'I' is not assignable to type 'D'.
-  Property 'bar' is missing in type I' but present in type 'D'.
+  Property 'bar' is missing in type 'I' but present in type 'D'.
 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2322: Type 'C' is not assignable to type 'D'.
   Type 'C' is missing the following properties from type 'D': other, bar
 
@@ -30,13 +30,13 @@ tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2322: T
     i = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'I'.
-!!! error TS2322:   Property 'other' is missing in type C' but present in type 'I'.
+!!! error TS2322:   Property 'other' is missing in type 'C' but present in type 'I'.
     
     i = d;
     d = i; // error
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'D'.
-!!! error TS2322:   Property 'bar' is missing in type I' but present in type 'D'.
+!!! error TS2322:   Property 'bar' is missing in type 'I' but present in type 'D'.
     
     c = d;
     d = c; // error
diff --git a/tests/baselines/reference/interfaceImplementation2.errors.txt b/tests/baselines/reference/interfaceImplementation2.errors.txt
index 9df5edaf47bb0..df30d93ef5fd0 100644
--- a/tests/baselines/reference/interfaceImplementation2.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/interfaceImplementation2.ts(8,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-  Property 'iFn' is missing in type C3' but present in type 'I1'.
+  Property 'iFn' is missing in type 'C3' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation2.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/interfaceImplementation2.ts(8,7): error TS2420: Class 'C3'
     class C3 implements I1 {
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'iFn' is missing in type C3' but present in type 'I1'.
+!!! error TS2420:   Property 'iFn' is missing in type 'C3' but present in type 'I1'.
         public iObj:{ };
         public iNum:number;
         public iAny:any;
diff --git a/tests/baselines/reference/interfaceImplementation3.errors.txt b/tests/baselines/reference/interfaceImplementation3.errors.txt
index 491ec880b5d44..e875930aeecdf 100644
--- a/tests/baselines/reference/interfaceImplementation3.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/interfaceImplementation3.ts(8,7): error TS2420: Class 'C4' incorrectly implements interface 'I1'.
-  Property 'iAny' is missing in type C4' but present in type 'I1'.
+  Property 'iAny' is missing in type 'C4' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation3.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/interfaceImplementation3.ts(8,7): error TS2420: Class 'C4'
     class C4 implements I1 {
           ~~
 !!! error TS2420: Class 'C4' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'iAny' is missing in type C4' but present in type 'I1'.
+!!! error TS2420:   Property 'iAny' is missing in type 'C4' but present in type 'I1'.
         public iObj:{ };
         public iNum:number;
         public iFn() { }
diff --git a/tests/baselines/reference/interfaceImplementation4.errors.txt b/tests/baselines/reference/interfaceImplementation4.errors.txt
index 26e664e59ebff..727d8703f65e6 100644
--- a/tests/baselines/reference/interfaceImplementation4.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation4.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/interfaceImplementation4.ts(8,7): error TS2420: Class 'C5' incorrectly implements interface 'I1'.
-  Property 'iObj' is missing in type C5' but present in type 'I1'.
+  Property 'iObj' is missing in type 'C5' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation4.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/interfaceImplementation4.ts(8,7): error TS2420: Class 'C5'
     class C5 implements I1 {
           ~~
 !!! error TS2420: Class 'C5' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'iObj' is missing in type C5' but present in type 'I1'.
+!!! error TS2420:   Property 'iObj' is missing in type 'C5' but present in type 'I1'.
         public iNum:number;
         public iAny:any;
         public iFn() { }
diff --git a/tests/baselines/reference/interfaceImplementation6.errors.txt b/tests/baselines/reference/interfaceImplementation6.errors.txt
index 6ecab72530016..24cf38ef810b1 100644
--- a/tests/baselines/reference/interfaceImplementation6.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/interfaceImplementation6.ts(9,7): error TS2420: Class 'C2' incorrectly implements interface 'I1'.
   Property 'item' is private in type 'C2' but not in type 'I1'.
 tests/cases/compiler/interfaceImplementation6.ts(13,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-  Property 'item' is missing in type C3' but present in type 'I1'.
+  Property 'item' is missing in type 'C3' but present in type 'I1'.
 
 
 ==== tests/cases/compiler/interfaceImplementation6.ts (2 errors) ====
@@ -23,7 +23,7 @@ tests/cases/compiler/interfaceImplementation6.ts(13,7): error TS2420: Class 'C3'
     class C3 implements I1 {
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
-!!! error TS2420:   Property 'item' is missing in type C3' but present in type 'I1'.
+!!! error TS2420:   Property 'item' is missing in type 'C3' but present in type 'I1'.
         constructor() {
            var item: number;
         }
diff --git a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
index 711c48aba09b7..1c2f23cdb1f82 100644
--- a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
+++ b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
@@ -1,35 +1,35 @@
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(19,1): error TS2322: Type 'A' is not assignable to type 'A & B'.
   Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type A' but present in type 'B'.
+    Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(20,1): error TS2322: Type 'B' is not assignable to type 'A & B'.
   Type 'B' is not assignable to type 'A'.
-    Property 'a' is missing in type B' but present in type 'A'.
+    Property 'a' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(23,1): error TS2322: Type 'A | B' is not assignable to type '(A & B) | (C & D)'.
   Type 'A' is not assignable to type '(A & B) | (C & D)'.
     Type 'A' is not assignable to type 'C & D'.
       Type 'A' is not assignable to type 'C'.
-        Property 'c' is missing in type A' but present in type 'C'.
+        Property 'c' is missing in type 'A' but present in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(25,1): error TS2322: Type 'C | D' is not assignable to type '(A & B) | (C & D)'.
   Type 'C' is not assignable to type '(A & B) | (C & D)'.
     Type 'C' is not assignable to type 'C & D'.
       Type 'C' is not assignable to type 'D'.
-        Property 'd' is missing in type C' but present in type 'D'.
+        Property 'd' is missing in type 'C' but present in type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(26,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
   Type 'C & D' is not assignable to type 'A & B'.
     Type 'C & D' is not assignable to type 'A'.
-      Property 'a' is missing in type C & D' but present in type 'A'.
+      Property 'a' is missing in type 'C & D' but present in type 'A'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(27,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
   Type 'C & D' is not assignable to type 'A | B'.
     Type 'C & D' is not assignable to type 'B'.
-      Property 'b' is missing in type C & D' but present in type 'B'.
+      Property 'b' is missing in type 'C & D' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(28,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
   Type 'A & B' is not assignable to type 'C & D'.
     Type 'A & B' is not assignable to type 'C'.
-      Property 'c' is missing in type A & B' but present in type 'C'.
+      Property 'c' is missing in type 'A & B' but present in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(29,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
   Type 'A & B' is not assignable to type 'C | D'.
     Type 'A & B' is not assignable to type 'D'.
-      Property 'd' is missing in type A & B' but present in type 'D'.
+      Property 'd' is missing in type 'A & B' but present in type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(31,1): error TS2322: Type 'A & B' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
   Type 'A & B' is not assignable to type 'B & D'.
     Type 'A & B' is not assignable to type 'D'.
@@ -44,15 +44,15 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(34,1): e
   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
     Type 'C' is not assignable to type 'B & D'.
       Type 'C' is not assignable to type 'B'.
-        Property 'b' is missing in type C' but present in type 'B'.
+        Property 'b' is missing in type 'C' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(35,1): error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
   Type 'A & C' is not assignable to type 'A & B'.
     Type 'A & C' is not assignable to type 'B'.
-      Property 'b' is missing in type A & C' but present in type 'B'.
+      Property 'b' is missing in type 'A & C' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
   Type 'A & C' is not assignable to type 'C & D'.
     Type 'A & C' is not assignable to type 'D'.
-      Property 'd' is missing in type A & C' but present in type 'D'.
+      Property 'd' is missing in type 'A & C' but present in type 'D'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts (14 errors) ====
@@ -78,12 +78,12 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
     ~~~
 !!! error TS2322: Type 'A' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
     anb = b;
     ~~~
 !!! error TS2322: Type 'B' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'B' is not assignable to type 'A'.
-!!! error TS2322:     Property 'a' is missing in type B' but present in type 'A'.
+!!! error TS2322:     Property 'a' is missing in type 'B' but present in type 'A'.
     
     x = anb;  // Ok
     x = aob;
@@ -92,7 +92,7 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'A' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'A' is not assignable to type 'C & D'.
 !!! error TS2322:       Type 'A' is not assignable to type 'C'.
-!!! error TS2322:         Property 'c' is missing in type A' but present in type 'C'.
+!!! error TS2322:         Property 'c' is missing in type 'A' but present in type 'C'.
     x = cnd;  // Ok
     x = cod;
     ~
@@ -100,31 +100,31 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'C' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'C & D'.
 !!! error TS2322:       Type 'C' is not assignable to type 'D'.
-!!! error TS2322:         Property 'd' is missing in type C' but present in type 'D'.
+!!! error TS2322:         Property 'd' is missing in type 'C' but present in type 'D'.
     anb = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A & B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'A'.
-!!! error TS2322:       Property 'a' is missing in type C & D' but present in type 'A'.
+!!! error TS2322:       Property 'a' is missing in type 'C & D' but present in type 'A'.
     aob = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A | B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'B'.
-!!! error TS2322:       Property 'b' is missing in type C & D' but present in type 'B'.
+!!! error TS2322:       Property 'b' is missing in type 'C & D' but present in type 'B'.
     cnd = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C & D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'C'.
-!!! error TS2322:       Property 'c' is missing in type A & B' but present in type 'C'.
+!!! error TS2322:       Property 'c' is missing in type 'A & B' but present in type 'C'.
     cod = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C | D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'D'.
-!!! error TS2322:       Property 'd' is missing in type A & B' but present in type 'D'.
+!!! error TS2322:       Property 'd' is missing in type 'A & B' but present in type 'D'.
     
     y = anb;
     ~
@@ -148,19 +148,19 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'B & D'.
 !!! error TS2322:       Type 'C' is not assignable to type 'B'.
-!!! error TS2322:         Property 'b' is missing in type C' but present in type 'B'.
+!!! error TS2322:         Property 'b' is missing in type 'C' but present in type 'B'.
     anb = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'A & B'.
 !!! error TS2322:     Type 'A & C' is not assignable to type 'B'.
-!!! error TS2322:       Property 'b' is missing in type A & C' but present in type 'B'.
+!!! error TS2322:       Property 'b' is missing in type 'A & C' but present in type 'B'.
     aob = y;  // Ok
     cnd = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'C & D'.
 !!! error TS2322:     Type 'A & C' is not assignable to type 'D'.
-!!! error TS2322:       Property 'd' is missing in type A & C' but present in type 'D'.
+!!! error TS2322:       Property 'd' is missing in type 'A & C' but present in type 'D'.
     cod = y;  // Ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionTypeAssignment.errors.txt b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
index d45202e24e033..bfc0fe842c31d 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.errors.txt
+++ b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(8,1): error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; b: string; }'.
-  Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: string; }'.
+  Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(9,1): error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
   Type '{ a: string; }' is not assignable to type '{ b: string; }'.
-    Property 'b' is missing in type { a: string; }' but present in type '{ b: string; }'.
+    Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(13,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; b: string; }'.
-  Property 'a' is missing in type { b: string; }' but present in type '{ a: string; b: string; }'.
+  Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
   Type '{ b: string; }' is not assignable to type '{ a: string; }'.
-    Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
+    Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts (4 errors) ====
@@ -21,24 +21,24 @@ tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1):
     x = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; b: string; }'.
-!!! error TS2322:   Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: string; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
     y = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Type '{ a: string; }' is not assignable to type '{ b: string; }'.
-!!! error TS2322:     Property 'b' is missing in type { a: string; }' but present in type '{ b: string; }'.
+!!! error TS2322:     Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
     
     b = x;
     b = y;
     x = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; b: string; }'.
-!!! error TS2322:   Property 'a' is missing in type { b: string; }' but present in type '{ a: string; b: string; }'.
+!!! error TS2322:   Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
     y = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Type '{ b: string; }' is not assignable to type '{ a: string; }'.
-!!! error TS2322:     Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
+!!! error TS2322:     Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
     
     x = y;
     y = x;
diff --git a/tests/baselines/reference/invalidReturnStatements.errors.txt b/tests/baselines/reference/invalidReturnStatements.errors.txt
index 3badd90c6af9c..be929ce558448 100644
--- a/tests/baselines/reference/invalidReturnStatements.errors.txt
+++ b/tests/baselines/reference/invalidReturnStatements.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(5
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,22): error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
   Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,22): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'name' is missing in type C' but present in type 'D'.
+  Property 'name' is missing in type 'C' but present in type 'D'.
 
 
 ==== tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts (6 errors) ====
@@ -40,6 +40,6 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(1
     function fn11(): D { return new C(); }
                          ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'name' is missing in type C' but present in type 'D'.
+!!! error TS2322:   Property 'name' is missing in type 'C' but present in type 'D'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern17.errors.txt b/tests/baselines/reference/iterableArrayPattern17.errors.txt
index c2e98479941e3..8cb284d21d3ea 100644
--- a/tests/baselines/reference/iterableArrayPattern17.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern17.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(16,17): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error TS2737: Property 'x' is missing in type FooIterator' but present in type 'Bar'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error TS2737: Property 'x' is missing in type 'FooIterator' but present in type 'Bar'.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts (2 errors) ====
@@ -23,4 +23,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'x' is missing in type FooIterator' but present in type 'Bar'.
\ No newline at end of file
+!!! error TS2737: Property 'x' is missing in type 'FooIterator' but present in type 'Bar'.
\ No newline at end of file
diff --git a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
index 71e5e4ca0d9a1..470ee4cfb6da2 100644
--- a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
         Types of property 'next' are incompatible.
           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
             Type '{ value: symbol; }' is not assignable to type 'IteratorResult<symbol>'.
-              Property 'done' is missing in type { value: symbol; }' but present in type 'IteratorResult<symbol>'.
+              Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
 
 
 ==== tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts (1 errors) ====
@@ -30,4 +30,4 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
 !!! error TS2322:             Type '{ value: symbol; }' is not assignable to type 'IteratorResult<symbol>'.
-!!! error TS2322:               Property 'done' is missing in type { value: symbol; }' but present in type 'IteratorResult<symbol>'.
\ No newline at end of file
+!!! error TS2322:               Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocFunctionType.errors.txt b/tests/baselines/reference/jsdocFunctionType.errors.txt
index 573f97171ce2b..cd3def357be53 100644
--- a/tests/baselines/reference/jsdocFunctionType.errors.txt
+++ b/tests/baselines/reference/jsdocFunctionType.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/jsdoc/functions.js(65,14): error TS2345: Argument of type 'typeof E' is not assignable to parameter of type 'new (arg1: number) => { length: number; }'.
-  Property 'length' is missing in type E' but present in type '{ length: number; }'.
+  Property 'length' is missing in type 'E' but present in type '{ length: number; }'.
 
 
 ==== tests/cases/conformance/jsdoc/functions.js (1 errors) ====
@@ -70,5 +70,5 @@ tests/cases/conformance/jsdoc/functions.js(65,14): error TS2345: Argument of typ
     var y3 = id2(E);
                  ~
 !!! error TS2345: Argument of type 'typeof E' is not assignable to parameter of type 'new (arg1: number) => { length: number; }'.
-!!! error TS2345:   Property 'length' is missing in type E' but present in type '{ length: number; }'.
+!!! error TS2345:   Property 'length' is missing in type 'E' but present in type '{ length: number; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateTag3.errors.txt b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
index e77fe17dd5f55..703a7f106106e 100644
--- a/tests/baselines/reference/jsdocTemplateTag3.errors.txt
+++ b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/jsdoc/a.js(14,29): error TS2339: Property 'a' does not exist on type 'U'.
 tests/cases/conformance/jsdoc/a.js(14,35): error TS2339: Property 'b' does not exist on type 'U'.
-tests/cases/conformance/jsdoc/a.js(21,3): error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
+tests/cases/conformance/jsdoc/a.js(21,3): error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
 tests/cases/conformance/jsdoc/a.js(24,15): error TS2304: Cannot find name 'NoLongerAllowed'.
 tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type parameter name was expected without curly braces.
 
@@ -32,7 +32,7 @@ tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type
     f({ a: 12, b: 'hi', c: null }, undefined, { c: false, d: 12, b: undefined }, 101, 'nope');
     f({ a: 12  }, undefined, undefined, 101, 'nope');
       ~~~~~~~~~~
-!!! error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
     
     /**
      * @template {NoLongerAllowed}
diff --git a/tests/baselines/reference/jsdocTypeTagCast.errors.txt b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
index e647ef4f0057d..bbd0b350b1d07 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.errors.txt
+++ b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/conformance/jsdoc/b.js(4,13): error TS2352: Conversion of type 'number' to type 'string' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-tests/cases/conformance/jsdoc/b.js(45,16): error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
+tests/cases/conformance/jsdoc/b.js(45,16): error TS2737: Property 'p' is missing in type 'SomeOther' but present in type 'SomeBase'.
 tests/cases/conformance/jsdoc/b.js(49,19): error TS2735: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
-tests/cases/conformance/jsdoc/b.js(51,17): error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
-tests/cases/conformance/jsdoc/b.js(52,17): error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
+tests/cases/conformance/jsdoc/b.js(51,17): error TS2737: Property 'q' is missing in type 'SomeDerived' but present in type 'SomeOther'.
+tests/cases/conformance/jsdoc/b.js(52,17): error TS2737: Property 'q' is missing in type 'SomeBase' but present in type 'SomeOther'.
 tests/cases/conformance/jsdoc/b.js(58,1): error TS2322: Type 'SomeFakeClass' is not assignable to type 'SomeBase'.
   Types of property 'p' are incompatible.
     Type 'string | number' is not assignable to type 'number'.
@@ -66,7 +66,7 @@ tests/cases/conformance/jsdoc/b.js(67,8): error TS2454: Variable 'numOrStr' is u
     someBase = /** @type {SomeBase} */(someBase);
     someBase = /** @type {SomeBase} */(someOther); // Error
                    ~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
+!!! error TS2737: Property 'p' is missing in type 'SomeOther' but present in type 'SomeBase'.
     
     someDerived = /** @type {SomeDerived} */(someDerived);
     someDerived = /** @type {SomeDerived} */(someBase);
@@ -76,10 +76,10 @@ tests/cases/conformance/jsdoc/b.js(67,8): error TS2454: Variable 'numOrStr' is u
     
     someOther = /** @type {SomeOther} */(someDerived); // Error
                     ~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
+!!! error TS2737: Property 'q' is missing in type 'SomeDerived' but present in type 'SomeOther'.
     someOther = /** @type {SomeOther} */(someBase); // Error
                     ~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
+!!! error TS2737: Property 'q' is missing in type 'SomeBase' but present in type 'SomeOther'.
     someOther = /** @type {SomeOther} */(someOther);
     
     someFakeClass = someBase;
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 7ce3abc71357b..8423cda5430af 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -21,7 +21,7 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(59,9): error TS2403: Su
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(75,45): error TS2737: Property 'y' is missing in type { x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(75,45): error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(77,59): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
   Object literal may only specify known properties, and 'z' does not exist in type 'Readonly<{ x: number; y: number; }>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(83,58): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Partial<{ x: number; y: number; }>'.
@@ -155,7 +155,7 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(152,17): error TS2339:
     function f20() {
         let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
                                                 ~~~~~~~~
-!!! error TS2737: Property 'y' is missing in type { x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
+!!! error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
         let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
         let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
                                                               ~~~~
diff --git a/tests/baselines/reference/mappedTypes6.errors.txt b/tests/baselines/reference/mappedTypes6.errors.txt
index 8287ba1e45eec..58e763cbcf90b 100644
--- a/tests/baselines/reference/mappedTypes6.errors.txt
+++ b/tests/baselines/reference/mappedTypes6.errors.txt
@@ -12,13 +12,13 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(56,5): error TS2322: Type '
 tests/cases/conformance/types/mapped/mappedTypes6.ts(57,5): error TS2322: Type '{}' is not assignable to type 'Required<T>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(58,5): error TS2322: Type '{}' is not assignable to type 'T'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(92,1): error TS2322: Type '{ a: number; }' is not assignable to type 'Foo'.
-  Property 'b' is missing in type { a: number; }' but present in type 'Foo'.
+  Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(104,1): error TS2322: Type '{ a: number; }' is not assignable to type 'Required<Foo>'.
   Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
 tests/cases/conformance/types/mapped/mappedTypes6.ts(105,1): error TS2322: Type '{ a: number; b: number; }' is not assignable to type 'Required<Foo>'.
   Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
 tests/cases/conformance/types/mapped/mappedTypes6.ts(106,1): error TS2322: Type '{ a: number; b: number; c: number; }' is not assignable to type 'Required<Foo>'.
-  Property 'd' is missing in type { a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
+  Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(116,4): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(119,4): error TS2540: Cannot assign to 'a' because it is a constant or a read-only property.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
@@ -144,7 +144,7 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     x1 = { a: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'b' is missing in type { a: number; }' but present in type 'Foo'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
     x1 = { a: 1, b: 1 };
     x1 = { a: 1, b: 1, c: 1 };
     x1 = { a: 1, b: 1, c: 1, d: 1 };
@@ -167,7 +167,7 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     x2 = { a: 1, b: 1, c: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; b: number; c: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Property 'd' is missing in type { a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
+!!! error TS2322:   Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
     x2 = { a: 1, b: 1, c: 1, d: 1 };
     
     type Bar = {
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
index fb6d7cfe587ba..007ccdc3c0893 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
@@ -3,7 +3,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(23,7): error TS2415: Class 'E' incorrectly extends base class 'C2'.
   Property 'w' is private in type 'C2' but not in type 'E'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(23,7): error TS2420: Class 'E' incorrectly implements interface 'A'.
-  Property 'x' is missing in type E' but present in type 'A'.
+  Property 'x' is missing in type 'E' but present in type 'A'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(30,11): error TS2341: Property 'x' is private and only accessible within class 'C'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(31,12): error TS2341: Property 'w' is private and only accessible within class 'C2'.
 
@@ -40,7 +40,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
 !!! error TS2415:   Property 'w' is private in type 'C2' but not in type 'E'.
           ~
 !!! error TS2420: Class 'E' incorrectly implements interface 'A'.
-!!! error TS2420:   Property 'x' is missing in type E' but present in type 'A'.
+!!! error TS2420:   Property 'x' is missing in type 'E' but present in type 'A'.
         w: number;
         y: string;
         z: string;
diff --git a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
index cdad774ca1faa..69d2d1b43a1ff 100644
--- a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
+++ b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts(13,17): error TS2737: Property 'a' is missing in type B<T>' but present in type 'A<{}>'.
+tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts(13,17): error TS2737: Property 'a' is missing in type 'B<T>' but present in type 'A<{}>'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeF
         if (x instanceof B) {
             acceptA(x);
                     ~
-!!! error TS2737: Property 'a' is missing in type B<T>' but present in type 'A<{}>'.
+!!! error TS2737: Property 'a' is missing in type 'B<T>' but present in type 'A<{}>'.
         }
     
         if (x instanceof A) {
diff --git a/tests/baselines/reference/nonIterableRestElement3.errors.txt b/tests/baselines/reference/nonIterableRestElement3.errors.txt
index 6a5df2251b68f..275aa0cb3ced3 100644
--- a/tests/baselines/reference/nonIterableRestElement3.errors.txt
+++ b/tests/baselines/reference/nonIterableRestElement3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error TS2322: Type '(string | number)[]' is not assignable to type '{ bogus: number; }'.
-  Property 'bogus' is missing in type (string | number)[]' but present in type '{ bogus: number; }'.
+  Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
 
 
 ==== tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts (1 errors) ====
@@ -7,4 +7,4 @@ tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error
     [...c] = ["", 0];
         ~
 !!! error TS2322: Type '(string | number)[]' is not assignable to type '{ bogus: number; }'.
-!!! error TS2322:   Property 'bogus' is missing in type (string | number)[]' but present in type '{ bogus: number; }'.
\ No newline at end of file
+!!! error TS2322:   Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
index e7609be7363e1..22d7aa657274f 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-  Property 'foo' is missing in type {}' but present in type '{ foo: string; }'.
+  Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'number' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(14,1): error TS2322: Type 'true' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'string' is not assignable to type 'object'.
@@ -16,7 +16,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): err
     y = a; // expect error
     ~
 !!! error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-!!! error TS2322:   Property 'foo' is missing in type {}' but present in type '{ foo: string; }'.
+!!! error TS2322:   Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
     a = x;
     a = y;
     
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
index ad5f630676b87..bf573e10c8288 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
@@ -2,8 +2,8 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(8,6): error TS2
   Object literal may only specify known properties, and 'hello' does not exist in type 'I'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(10,17): error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I'.
   Object literal may only specify known properties, and 'what' does not exist in type 'I'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(11,4): error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(12,4): error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(11,4): error TS2737: Property 'value' is missing in type '{ toString: (s: string) => string; }' but present in type 'I'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(12,4): error TS2737: Property 'value' is missing in type '{ toString: (s: string) => string; }' but present in type 'I'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error TS2339: Property 'uhhh' does not exist on type 'string'.
 
 
@@ -26,10 +26,10 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error T
 !!! error TS2345:   Object literal may only specify known properties, and 'what' does not exist in type 'I'.
     f2({ toString: (s) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
+!!! error TS2737: Property 'value' is missing in type '{ toString: (s: string) => string; }' but present in type 'I'.
     f2({ toString: (s: string) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'value' is missing in type { toString: (s: string) => string; }' but present in type 'I'.
+!!! error TS2737: Property 'value' is missing in type '{ toString: (s: string) => string; }' but present in type 'I'.
     f2({ value: '', toString: (s) => s.uhhh }) // error
                                        ~~~~
 !!! error TS2339: Property 'uhhh' does not exist on type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
index 92ee58e53cee7..ccdb9db7898b0 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(8,6): error TS2345: Argument of type '{ hello: number; }' is not assignable to parameter of type 'I2'.
   Object literal may only specify known properties, and 'hello' does not exist in type 'I2'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(9,4): error TS2737: Property 'doStuff' is missing in type { value: string; }' but present in type 'I2'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(9,4): error TS2737: Property 'doStuff' is missing in type '{ value: string; }' but present in type 'I2'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(10,17): error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I2'.
   Object literal may only specify known properties, and 'what' does not exist in type 'I2'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(11,6): error TS2322: Type '(s: any) => any' is not assignable to type '() => string'.
@@ -22,7 +22,7 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(13,17): error
 !!! error TS2345:   Object literal may only specify known properties, and 'hello' does not exist in type 'I2'.
     f2({ value: '' })
        ~~~~~~~~~~~~~
-!!! error TS2737: Property 'doStuff' is missing in type { value: string; }' but present in type 'I2'.
+!!! error TS2737: Property 'doStuff' is missing in type '{ value: string; }' but present in type 'I2'.
     f2({ value: '', what: 1 }) 
                     ~~~~~~~
 !!! error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I2'.
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
index 44025b85a1e9f..a6f0b5a9bdd32 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/objectLiteralIndexerErrors.ts(13,54): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'y' is missing in type A' but present in type 'B'.
+  Property 'y' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A' is not assignable to type 'B'.
 
 
@@ -19,7 +19,7 @@ tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A
     var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
                                                          ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'y' is missing in type A' but present in type 'B'.
+!!! error TS2322:   Property 'y' is missing in type 'A' but present in type 'B'.
 !!! related TS6501 tests/cases/compiler/objectLiteralIndexerErrors.ts:13:26: The expected type comes from this index signature.
     o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
                  ~
diff --git a/tests/baselines/reference/objectLiteralNormalization.errors.txt b/tests/baselines/reference/objectLiteralNormalization.errors.txt
index 2305a2f0da204..52af1563231c7 100644
--- a/tests/baselines/reference/objectLiteralNormalization.errors.txt
+++ b/tests/baselines/reference/objectLiteralNormalization.errors.txt
@@ -11,7 +11,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
       Type 'string' is not assignable to type 'undefined'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(18,1): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
   Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
-    Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: number; }'.
+    Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
 
 
 ==== tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts (5 errors) ====
@@ -52,7 +52,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
 !!! error TS2322:   Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:     Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: number; }'.
+!!! error TS2322:     Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
     
     // Object literals containing spreads are not normalized
     declare let b1: { a: string, b: string } | { b: string, c: string };
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
index 3f23b89e950c6..43ebb6dc5a63b 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts(7,5): error TS2737: Property 'a' is missing in type { name: string; id: number; }' but present in type '{ a: string; id: number; }'.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts(7,5): error TS2737: Property 'a' is missing in type '{ name: string; id: number; }' but present in type '{ a: string; id: number; }'.
 
 
 ==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts (1 errors) ====
@@ -10,5 +10,5 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
     function foo(p: { a: string; id: number }) { }
     foo(person);  // error
         ~~~~~~
-!!! error TS2737: Property 'a' is missing in type { name: string; id: number; }' but present in type '{ a: string; id: number; }'.
+!!! error TS2737: Property 'a' is missing in type '{ name: string; id: number; }' but present in type '{ a: string; id: number; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index a2304c570a47e..bea86d96b08f0 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -2,9 +2,9 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(13,21): error TS233
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(16,5): error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
   Property 'sn' is optional in type '{ sn?: string | number; }' but required in type '{ sn: string | number; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(23,1): error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 'b' is missing in type { s: string; }' but present in type '{ s: string; b: boolean; }'.
+  Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 's' is missing in type { b: boolean; }' but present in type '{ s: string; b: boolean; }'.
+  Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,19): error TS2698: Spread types may only be created from object types.
@@ -49,12 +49,12 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,11): error TS233
     spread = { s: "foo" };  // error, missing 'b'
     ~~~~~~
 !!! error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 'b' is missing in type { s: string; }' but present in type '{ s: string; b: boolean; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
     let b = { b: false };
     spread = b; // error, missing 's'
     ~~~~~~
 !!! error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 's' is missing in type { b: boolean; }' but present in type '{ s: string; b: boolean; }'.
+!!! error TS2322:   Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
     
     // literal repeats are not allowed, but spread repeats are fine
     let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
index c55e5f4d097f0..0b582a9caf147 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2737: Property 'y' is missing in type C3<T2>' but present in type 'C4'.
+tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2737: Property 'y' is missing in type 'C3<T2>' but present in type 'C4'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts (1 errors) ====
@@ -28,4 +28,4 @@ tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectType
     var c3: C3<T2>;
     <C4>c3; // Should fail (private x originates in the same declaration, but different types)
     ~~~~~~
-!!! error TS2737: Property 'y' is missing in type C3<T2>' but present in type 'C4'.
\ No newline at end of file
+!!! error TS2737: Property 'y' is missing in type 'C3<T2>' but present in type 'C4'.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalPropertiesInClasses.errors.txt b/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
index 1acc3a65fe35c..29248ec558435 100644
--- a/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/optionalPropertiesInClasses.ts(10,7): error TS2420: Class 'C2' incorrectly implements interface 'ifoo'.
-  Property 'y' is missing in type C2' but present in type 'ifoo'.
+  Property 'y' is missing in type 'C2' but present in type 'ifoo'.
 
 
 ==== tests/cases/compiler/optionalPropertiesInClasses.ts (1 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/optionalPropertiesInClasses.ts(10,7): error TS2420: Class '
     class C2 implements ifoo { // ERROR - still need 'y'
           ~~
 !!! error TS2420: Class 'C2' incorrectly implements interface 'ifoo'.
-!!! error TS2420:   Property 'y' is missing in type C2' but present in type 'ifoo'.
+!!! error TS2420:   Property 'y' is missing in type 'C2' but present in type 'ifoo'.
     	public x:number;
     }
     
diff --git a/tests/baselines/reference/optionalPropertiesTest.errors.txt b/tests/baselines/reference/optionalPropertiesTest.errors.txt
index 6ca80e0ec6623..c4615d63284ab 100644
--- a/tests/baselines/reference/optionalPropertiesTest.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesTest.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/optionalPropertiesTest.ts(14,1): error TS2322: Type '{ name: string; }' is not assignable to type 'IFoo'.
-  Property 'id' is missing in type { name: string; }' but present in type 'IFoo'.
+  Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
 tests/cases/compiler/optionalPropertiesTest.ts(25,5): error TS2322: Type '{}' is not assignable to type 'i1'.
-  Property 'M' is missing in type {}' but present in type 'i1'.
+  Property 'M' is missing in type '{}' but present in type 'i1'.
 tests/cases/compiler/optionalPropertiesTest.ts(26,5): error TS2322: Type '{}' is not assignable to type 'i3'.
-  Property 'M' is missing in type {}' but present in type 'i3'.
+  Property 'M' is missing in type '{}' but present in type 'i3'.
 tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is not assignable to type 'i1'.
   Property 'M' is optional in type 'i2' but required in type 'i1'.
 
@@ -25,7 +25,7 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     foo = { name: "test" };            // Error, id missing
     ~~~
 !!! error TS2322: Type '{ name: string; }' is not assignable to type 'IFoo'.
-!!! error TS2322:   Property 'id' is missing in type { name: string; }' but present in type 'IFoo'.
+!!! error TS2322:   Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
     foo = {id: 1234, print:()=>{}}	   // Ok
     
     var s = foo.name || "default";
@@ -39,11 +39,11 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     var test1: i1 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i1'.
-!!! error TS2322:   Property 'M' is missing in type {}' but present in type 'i1'.
+!!! error TS2322:   Property 'M' is missing in type '{}' but present in type 'i1'.
     var test2: i3 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i3'.
-!!! error TS2322:   Property 'M' is missing in type {}' but present in type 'i3'.
+!!! error TS2322:   Property 'M' is missing in type '{}' but present in type 'i3'.
     var test3: i2 = {};
     var test4: i4 = {};
     var test5: i1 = { M: function () { } };
diff --git a/tests/baselines/reference/overloadingOnConstants1.errors.txt b/tests/baselines/reference/overloadingOnConstants1.errors.txt
index 4cc357265b9a4..ed4582b547747 100644
--- a/tests/baselines/reference/overloadingOnConstants1.errors.txt
+++ b/tests/baselines/reference/overloadingOnConstants1.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/overloadingOnConstants1.ts(22,5): error TS2322: Type 'Base' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type Base' but present in type 'Derived1'.
+  Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
 tests/cases/compiler/overloadingOnConstants1.ts(23,5): error TS2322: Type 'Derived1' is not assignable to type 'Derived3'.
-  Property 'biz' is missing in type Derived1' but present in type 'Derived3'.
+  Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
 tests/cases/compiler/overloadingOnConstants1.ts(24,5): error TS2322: Type 'Derived2' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type Derived2' but present in type 'Derived1'.
+  Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
 tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2322: Type 'Derived3' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type Derived3' but present in type 'Derived1'.
+  Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
 
 
 ==== tests/cases/compiler/overloadingOnConstants1.ts (4 errors) ====
@@ -33,16 +33,16 @@ tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2322: Type 'Deriv
     var htmlElement2: Derived1 = d2.createElement("yo")
         ~~~~~~~~~~~~
 !!! error TS2322: Type 'Base' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type Base' but present in type 'Derived1'.
+!!! error TS2322:   Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
     var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
         ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Derived1' is not assignable to type 'Derived3'.
-!!! error TS2322:   Property 'biz' is missing in type Derived1' but present in type 'Derived3'.
+!!! error TS2322:   Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
     var htmlDivElement2: Derived1 = d2.createElement("div");
         ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Derived2' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type Derived2' but present in type 'Derived1'.
+!!! error TS2322:   Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
     var htmlSpanElement2: Derived1 = d2.createElement("span");
         ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Derived3' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type Derived3' but present in type 'Derived1'.
\ No newline at end of file
+!!! error TS2322:   Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
index cae5718bb2dbf..38bef31cc5dc0 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,5): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,37): error TS2737: Property 'x' is missing in type D' but present in type 'A'.
+tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,37): error TS2737: Property 'x' is missing in type 'D' but present in type 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,5): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,38): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(18,27): error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
   Types of parameters 'x' and 'x' are incompatible.
-    Property 'q' is missing in type B' but present in type 'D'.
+    Property 'q' is missing in type 'B' but present in type 'D'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 
 
@@ -26,7 +26,7 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
         ~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
                                         ~
-!!! error TS2737: Property 'x' is missing in type D' but present in type 'A'.
+!!! error TS2737: Property 'x' is missing in type 'D' but present in type 'A'.
     
     var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fails, so first overload is picked.
         ~~~~~~~
@@ -38,7 +38,7 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
                               ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Property 'q' is missing in type B' but present in type 'D'.
+!!! error TS2345:     Property 'q' is missing in type 'B' but present in type 'D'.
         var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
                  ~~~~~~~~
 !!! error TS2344: Type 'D' does not satisfy the constraint 'A'.
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
index be54e50bb65ab..10d9bdf0d9fe3 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/overloadsWithProvisionalErrors.ts(6,11): error TS2322: Type
   Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(7,17): error TS2304: Cannot find name 'blah'.
 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; }' but present in type '{ a: number; b: number; }'.
+  Property 'b' is missing in type '{ a: any; }' but present in type '{ a: number; b: number; }'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'.
 
 
@@ -23,7 +23,7 @@ tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cann
     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 TS2322: Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type { a: any; }' but present in type '{ a: number; b: number; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: any; }' but present in type '{ a: number; b: number; }'.
 !!! 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/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index 425459aca04a9..c68851bbfa681 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -46,7 +46,7 @@ tests/cases/compiler/promisePermutations.ts(137,33): error TS2345: Argument of t
   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 tests/cases/compiler/promisePermutations.ts(144,35): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => IPromise<number>'.
 tests/cases/compiler/promisePermutations.ts(152,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-  Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
+  Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
 tests/cases/compiler/promisePermutations.ts(156,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
     Type 'number' is not assignable to type 'string'.
@@ -294,7 +294,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
     var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-!!! error TS2345:   Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
+!!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index 039d53d3e4be2..0d7225347759b 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -46,7 +46,7 @@ tests/cases/compiler/promisePermutations2.ts(136,33): error TS2345: Argument of
   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 tests/cases/compiler/promisePermutations2.ts(143,35): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => IPromise<number>'.
 tests/cases/compiler/promisePermutations2.ts(151,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-  Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
+  Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
 tests/cases/compiler/promisePermutations2.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
     Type 'number' is not assignable to type 'string'.
@@ -293,7 +293,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
     var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-!!! error TS2345:   Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
+!!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index cc6e8c2a35290..5b4db38c53a68 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -49,7 +49,7 @@ tests/cases/compiler/promisePermutations3.ts(136,33): error TS2345: Argument of
   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 tests/cases/compiler/promisePermutations3.ts(143,35): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => IPromise<number>'.
 tests/cases/compiler/promisePermutations3.ts(151,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-  Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
+  Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
 tests/cases/compiler/promisePermutations3.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
     Type 'number' is not assignable to type 'string'.
@@ -66,7 +66,7 @@ tests/cases/compiler/promisePermutations3.ts(159,21): error TS2345: Argument of
           Types of parameters 'value' and 'value' are incompatible.
             Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<{}>'.
-  Property 'catch' is missing in type IPromise<any>' but present in type 'Promise<{}>'.
+  Property 'catch' is missing in type 'IPromise<any>' but present in type 'Promise<{}>'.
 
 
 ==== tests/cases/compiler/promisePermutations3.ts (35 errors) ====
@@ -302,7 +302,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
     var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
-!!! error TS2345:   Property 'catch' is missing in type IPromise<string>' but present in type 'Promise<number>'.
+!!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
@@ -338,5 +338,5 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
     var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok
                         ~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<{}>'.
-!!! error TS2345:   Property 'catch' is missing in type IPromise<any>' but present in type 'Promise<{}>'.
+!!! error TS2345:   Property 'catch' is missing in type 'IPromise<any>' but present in type 'Promise<{}>'.
     var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
\ No newline at end of file
diff --git a/tests/baselines/reference/promisesWithConstraints.errors.txt b/tests/baselines/reference/promisesWithConstraints.errors.txt
index 2f30c7ad5d34c..30e65cf2762e7 100644
--- a/tests/baselines/reference/promisesWithConstraints.errors.txt
+++ b/tests/baselines/reference/promisesWithConstraints.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/promisesWithConstraints.ts(15,1): error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
   Type 'Foo' is not assignable to type 'Bar'.
-    Property 'y' is missing in type Foo' but present in type 'Bar'.
+    Property 'y' is missing in type 'Foo' but present in type 'Bar'.
 tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CPromise<Foo>' is not assignable to type 'CPromise<Bar>'.
   Type 'Foo' is not assignable to type 'Bar'.
 
@@ -24,7 +24,7 @@ tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CProm
     ~
 !!! error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
 !!! error TS2322:   Type 'Foo' is not assignable to type 'Bar'.
-!!! error TS2322:     Property 'y' is missing in type Foo' but present in type 'Bar'.
+!!! error TS2322:     Property 'y' is missing in type 'Foo' but present in type 'Bar'.
     
     var a2: CPromise<Foo>;
     var b2: CPromise<Bar>;
diff --git a/tests/baselines/reference/qualify.errors.txt b/tests/baselines/reference/qualify.errors.txt
index 4dbb577f1a37f..7b2c1f0f04a1a 100644
--- a/tests/baselines/reference/qualify.errors.txt
+++ b/tests/baselines/reference/qualify.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/qualify.ts(21,13): error TS2322: Type '3' is not assignable to type 'I'.
 tests/cases/compiler/qualify.ts(30,13): error TS2322: Type '3' is not assignable to type 'I2'.
 tests/cases/compiler/qualify.ts(45,13): error TS2322: Type 'I4' is not assignable to type 'I3'.
-  Property 'zeep' is missing in type I4' but present in type 'I3'.
+  Property 'zeep' is missing in type 'I4' but present in type 'I3'.
 tests/cases/compiler/qualify.ts(46,13): error TS2322: Type 'I4' is not assignable to type 'I3[]'.
   Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/qualify.ts(47,13): error TS2322: Type 'I4' is not assignable to type '() => I3'.
@@ -9,9 +9,9 @@ tests/cases/compiler/qualify.ts(47,13): error TS2322: Type 'I4' is not assignabl
 tests/cases/compiler/qualify.ts(48,13): error TS2322: Type 'I4' is not assignable to type '(k: I3) => void'.
   Type 'I4' provides no match for the signature '(k: I3): void'.
 tests/cases/compiler/qualify.ts(49,13): error TS2322: Type 'I4' is not assignable to type '{ k: I3; }'.
-  Property 'k' is missing in type I4' but present in type '{ k: I3; }'.
+  Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
 tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable to type 'T.I'.
-  Property 'p' is missing in type I' but present in type 'I'.
+  Property 'p' is missing in type 'I' but present in type 'I'.
 
 
 ==== tests/cases/compiler/qualify.ts (8 errors) ====
@@ -66,7 +66,7 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
             var v2:K1.I3=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type 'I3'.
-!!! error TS2322:   Property 'zeep' is missing in type I4' but present in type 'I3'.
+!!! error TS2322:   Property 'zeep' is missing in type 'I4' but present in type 'I3'.
             var v3:K1.I3[]=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type 'I3[]'.
@@ -82,7 +82,7 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
             var v6:{k:K1.I3;}=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type '{ k: I3; }'.
-!!! error TS2322:   Property 'k' is missing in type I4' but present in type '{ k: I3; }'.
+!!! error TS2322:   Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
         }
     }
     
@@ -94,6 +94,6 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
     var x:T.I=y;
         ~
 !!! error TS2322: Type 'I' is not assignable to type 'T.I'.
-!!! error TS2322:   Property 'p' is missing in type I' but present in type 'I'.
+!!! error TS2322:   Property 'p' is missing in type 'I' but present in type 'I'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
index 095ffa331c7a9..42b23e21c602c 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/recursiveClassReferenceTest.ts(16,19): error TS2304: Cannot find name 'Element'.
 tests/cases/compiler/recursiveClassReferenceTest.ts(56,11): error TS2663: Cannot find name 'domNode'. Did you mean the instance member 'this.domNode'?
 tests/cases/compiler/recursiveClassReferenceTest.ts(88,36): error TS2663: Cannot find name 'mode'. Did you mean the instance member 'this.mode'?
-tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2737: Property 'getInitialState' is missing in type Window' but present in type 'IMode'.
+tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2737: Property 'getInitialState' is missing in type 'Window' but present in type 'IMode'.
 
 
 ==== tests/cases/compiler/recursiveClassReferenceTest.ts (4 errors) ====
@@ -107,7 +107,7 @@ tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2737: Proper
     		public getInitialState(): IState {
     			return new State(self);
     			                 ~~~~
-!!! error TS2737: Property 'getInitialState' is missing in type Window' but present in type 'IMode'.
+!!! error TS2737: Property 'getInitialState' is missing in type 'Window' but present in type 'IMode'.
     		}
     
     
diff --git a/tests/baselines/reference/recursiveInheritance3.errors.txt b/tests/baselines/reference/recursiveInheritance3.errors.txt
index 8357ff20bdfb6..8ae77ecb235a1 100644
--- a/tests/baselines/reference/recursiveInheritance3.errors.txt
+++ b/tests/baselines/reference/recursiveInheritance3.errors.txt
@@ -1,12 +1,12 @@
 tests/cases/compiler/recursiveInheritance3.ts(1,7): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property 'other' is missing in type C' but present in type 'I'.
+  Property 'other' is missing in type 'C' but present in type 'I'.
 
 
 ==== tests/cases/compiler/recursiveInheritance3.ts (1 errors) ====
     class C implements I {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property 'other' is missing in type C' but present in type 'I'.
+!!! error TS2420:   Property 'other' is missing in type 'C' but present in type 'I'.
         public foo(x: any) { return x; }
         private x = 1;
     }
diff --git a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
index 16ebbef12996a..9d402a7fbd3b5 100644
--- a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1): error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
   Type 'LinkedList<Entity>' is not assignable to type 'Product'.
-    Property 'price' is missing in type LinkedList<Entity>' but present in type 'Product'.
+    Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
 
 
 ==== tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts (1 errors) ====
@@ -26,5 +26,5 @@ tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1):
     ~~~~~~~~~~~
 !!! error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
 !!! error TS2322:   Type 'LinkedList<Entity>' is not assignable to type 'Product'.
-!!! error TS2322:     Property 'price' is missing in type LinkedList<Entity>' but present in type 'Product'.
+!!! error TS2322:     Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
index fcf9a7f04bdd0..1d02c76fc1cb3 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
@@ -1,9 +1,9 @@
 /user.js(2,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
 /user.js(5,7): error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
-  Property 'b' is missing in type { "a": number; }' but present in type '{ b: number; }'.
+  Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
 /user.js(9,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
 /user.js(12,7): error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
-  Property 'b' is missing in type { a: number; }' but present in type '{ b: number; }'.
+  Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
 
 
 ==== /user.js (4 errors) ====
@@ -16,7 +16,7 @@
     const json1 = require("./json.json"); // No error (bad)
           ~~~~~
 !!! error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type { "a": number; }' but present in type '{ b: number; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
     json1.b; // No error (OK since that's the type annotation)
     
     const js0 = require("./js.js");
@@ -28,7 +28,7 @@
     const js1 = require("./js.js"); // Error (good)
           ~~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type { a: number; }' but present in type '{ b: number; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
     js1.b;
 ==== /json.json (0 errors) ====
     { "a": 0 }
diff --git a/tests/baselines/reference/restTupleElements1.errors.txt b/tests/baselines/reference/restTupleElements1.errors.txt
index 13d1d5137f093..98953b9a865cc 100644
--- a/tests/baselines/reference/restTupleElements1.errors.txt
+++ b/tests/baselines/reference/restTupleElements1.errors.txt
@@ -3,9 +3,9 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(8,13): error TS1256: A
 tests/cases/conformance/types/tuple/restTupleElements1.ts(9,13): error TS2574: A rest element type must be an array type.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(10,13): error TS2574: A rest element type must be an array type.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(10,16): error TS8020: JSDoc types can only be used inside documentation comments.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(23,31): error TS2737: Property '0' is missing in type number[]' but present in type '[number, ...number[]]'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(24,31): error TS2737: Property '0' is missing in type []' but present in type '[number, ...number[]]'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(29,18): error TS2737: Property '0' is missing in type number[]' but present in type '[number]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(23,31): error TS2737: Property '0' is missing in type 'number[]' but present in type '[number, ...number[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(24,31): error TS2737: Property '0' is missing in type '[]' but present in type '[number, ...number[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(29,18): error TS2737: Property '0' is missing in type 'number[]' but present in type '[number]'.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(30,18): error TS2344: Type '[number, ...number[]]' does not satisfy the constraint '[number]'.
   Types of property 'length' are incompatible.
     Type 'number' is not assignable to type '1'.
@@ -19,7 +19,7 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(34,31): error TS2344:
 tests/cases/conformance/types/tuple/restTupleElements1.ts(35,31): error TS2344: Type '[number, number, number, string]' does not satisfy the constraint '[number, ...number[]]'.
   Property '3' is incompatible with rest element type.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2737: Property '0' is missing in type []' but present in type '[{}, ...{}[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2737: Property '0' is missing in type '[]' but present in type '[{}, ...{}[]]'.
 
 
 ==== tests/cases/conformance/types/tuple/restTupleElements1.ts (14 errors) ====
@@ -57,17 +57,17 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2737: P
     
     assign<[number, ...number[]], number[]>();  // Error
                                   ~~~~~~~~
-!!! error TS2737: Property '0' is missing in type number[]' but present in type '[number, ...number[]]'.
+!!! error TS2737: Property '0' is missing in type 'number[]' but present in type '[number, ...number[]]'.
     assign<[number, ...number[]], []>();  // Error
                                   ~~
-!!! error TS2737: Property '0' is missing in type []' but present in type '[number, ...number[]]'.
+!!! error TS2737: Property '0' is missing in type '[]' but present in type '[number, ...number[]]'.
     assign<[number, ...number[]], [number]>();
     assign<[number, ...number[]], [number, number]>();
     assign<[number, ...number[]], [number, number, ...number[]]>();
     
     assign<[number], [...number[]]>();  // Error
                      ~~~~~~~~~~~~~
-!!! error TS2737: Property '0' is missing in type number[]' but present in type '[number]'.
+!!! error TS2737: Property '0' is missing in type 'number[]' but present in type '[number]'.
     assign<[number], [number, ...number[]]>();  // Error
                      ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2344: Type '[number, ...number[]]' does not satisfy the constraint '[number]'.
@@ -117,7 +117,7 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2737: P
     
     f0([]);  // Error
        ~~
-!!! error TS2737: Property '0' is missing in type []' but present in type '[{}, ...{}[]]'.
+!!! error TS2737: Property '0' is missing in type '[]' but present in type '[{}, ...{}[]]'.
     f0([1]);
     f0([1, 2, 3]);
     f0([1, "hello", true]);
diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt b/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt
index 2dd3e2884fd1b..5acee42bc838d 100644
--- a/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt
+++ b/tests/baselines/reference/restTuplesFromContextualTypes.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/rest/restTuplesFromContextualTypes.ts(56,7): error TS2345: Argument of type '(a: number, b: any, ...x: any[]) => void' is not assignable to parameter of type '(x: number, ...args: T) => void'.
   Types of parameters 'b' and 'args' are incompatible.
     Type 'T' is not assignable to type '[any, ...any[]]'.
-      Property '0' is missing in type any[]' but present in type '[any, ...any[]]'.
+      Property '0' is missing in type 'any[]' but present in type '[any, ...any[]]'.
 
 
 ==== tests/cases/conformance/types/rest/restTuplesFromContextualTypes.ts (1 errors) ====
@@ -65,7 +65,7 @@ tests/cases/conformance/types/rest/restTuplesFromContextualTypes.ts(56,7): error
 !!! error TS2345: Argument of type '(a: number, b: any, ...x: any[]) => void' is not assignable to parameter of type '(x: number, ...args: T) => void'.
 !!! error TS2345:   Types of parameters 'b' and 'args' are incompatible.
 !!! error TS2345:     Type 'T' is not assignable to type '[any, ...any[]]'.
-!!! error TS2345:       Property '0' is missing in type any[]' but present in type '[any, ...any[]]'.
+!!! error TS2345:       Property '0' is missing in type 'any[]' but present in type '[any, ...any[]]'.
     }
     
     // Repro from #25288
diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
index a3e9faebeb541..a79057e085e35 100644
--- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
+++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(12,1): error TS2322: Type 'C' is not assignable to type 'A'.
-  Property 'prop' is missing in type C' but present in type 'A'.
+  Property 'prop' is missing in type 'C' but present in type 'A'.
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(13,5): error TS2322: Type 'typeof B' is not assignable to type 'A'.
-  Property 'prop' is missing in type typeof B' but present in type 'A'.
+  Property 'prop' is missing in type 'typeof B' but present in type 'A'.
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(16,5): error TS2322: Type 'C' is not assignable to type 'B'.
-  Property 'prop' is missing in type C' but present in type 'B'.
+  Property 'prop' is missing in type 'C' but present in type 'B'.
 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(17,5): error TS2322: Type 'typeof B' is not assignable to type 'B'.
-  Property 'prop' is missing in type typeof B' but present in type 'B'.
+  Property 'prop' is missing in type 'typeof B' but present in type 'B'.
 
 
 ==== tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts (4 errors) ====
@@ -23,22 +23,22 @@ tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.
     a = new C(); // error prop is missing
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'A'.
-!!! error TS2322:   Property 'prop' is missing in type C' but present in type 'A'.
+!!! error TS2322:   Property 'prop' is missing in type 'C' but present in type 'A'.
     a = B; // error prop is missing
         ~
 !!! error TS2322: Type 'typeof B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'prop' is missing in type typeof B' but present in type 'A'.
+!!! error TS2322:   Property 'prop' is missing in type 'typeof B' but present in type 'A'.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:13:5: Did you mean to use 'new' with this expression?
     a = C;
     
     var b: B = new C(); // error prop is missing
         ~
 !!! error TS2322: Type 'C' is not assignable to type 'B'.
-!!! error TS2322:   Property 'prop' is missing in type C' but present in type 'B'.
+!!! error TS2322:   Property 'prop' is missing in type 'C' but present in type 'B'.
     b = B; // error prop is missing
         ~
 !!! error TS2322: Type 'typeof B' is not assignable to type 'B'.
-!!! error TS2322:   Property 'prop' is missing in type typeof B' but present in type 'B'.
+!!! error TS2322:   Property 'prop' is missing in type 'typeof B' but present in type 'B'.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:17:5: Did you mean to use 'new' with this expression?
     b = C;
     b = a;
diff --git a/tests/baselines/reference/strictBindCallApply1.errors.txt b/tests/baselines/reference/strictBindCallApply1.errors.txt
index 0846445548ede..4b84b18eceae1 100644
--- a/tests/baselines/reference/strictBindCallApply1.errors.txt
+++ b/tests/baselines/reference/strictBindCallApply1.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/functions/strictBindCallApply1.ts(6,35): error TS2345: A
 tests/cases/conformance/functions/strictBindCallApply1.ts(9,11): error TS2554: Expected 3 arguments, but got 2.
 tests/cases/conformance/functions/strictBindCallApply1.ts(10,35): error TS2345: Argument of type '20' is not assignable to parameter of type 'string'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(11,11): error TS2554: Expected 3 arguments, but got 4.
-tests/cases/conformance/functions/strictBindCallApply1.ts(14,32): error TS2737: Property '1' is missing in type [number]' but present in type '[number, string]'.
+tests/cases/conformance/functions/strictBindCallApply1.ts(14,32): error TS2737: Property '1' is missing in type '[number]' but present in type '[number, string]'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(15,37): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(16,32): error TS2345: Argument of type '[number, string, number]' is not assignable to parameter of type '[number, string]'.
   Types of property 'length' are incompatible.
@@ -50,7 +50,7 @@ tests/cases/conformance/functions/strictBindCallApply1.ts(57,12): error TS2345:
     let a00 = foo.apply(undefined, [10, "hello"]);
     let a01 = foo.apply(undefined, [10]);  // Error
                                    ~~~~
-!!! error TS2737: Property '1' is missing in type [number]' but present in type '[number, string]'.
+!!! error TS2737: Property '1' is missing in type '[number]' but present in type '[number, string]'.
     let a02 = foo.apply(undefined, [10, 20]);  // Error
                                         ~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
index de17a007b5638..62341d9cea51b 100644
--- a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
+++ b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
@@ -76,7 +76,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(84,1): error TS2322: Type 'Fun
   Type 'Func<string, void>' is not assignable to type 'Func<Object, void>'.
 tests/cases/compiler/strictFunctionTypesErrors.ts(111,1): error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
   Type 'Animal' is not assignable to type 'Dog'.
-    Property 'dog' is missing in type Animal' but present in type 'Dog'.
+    Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
 tests/cases/compiler/strictFunctionTypesErrors.ts(126,1): error TS2322: Type 'Crate<Dog>' is not assignable to type 'Crate<Animal>'.
   Types of property 'onSetItem' are incompatible.
     Type '(item: Dog) => void' is not assignable to type '(item: Animal) => void'.
@@ -321,7 +321,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(155,5): error TS2322: Type '(c
     ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
 !!! error TS2322:   Type 'Animal' is not assignable to type 'Dog'.
-!!! error TS2322:     Property 'dog' is missing in type Animal' but present in type 'Dog'.
+!!! error TS2322:     Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
     dogComparer2 = animalComparer2;  // Ok
     
     // Crate<T> is invariant in --strictFunctionTypes mode
diff --git a/tests/baselines/reference/strictTupleLength.errors.txt b/tests/baselines/reference/strictTupleLength.errors.txt
index 6b7a1fd7e8c6b..3b374074c2159 100644
--- a/tests/baselines/reference/strictTupleLength.errors.txt
+++ b/tests/baselines/reference/strictTupleLength.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/tuple/strictTupleLength.ts(11,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't1' must be of type '[number]', but here has type '[number, number]'.
 tests/cases/conformance/types/tuple/strictTupleLength.ts(12,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't2' must be of type '[number, number]', but here has type '[number]'.
 tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2322: Type 'number[]' is not assignable to type '[number]'.
-  Property '0' is missing in type number[]' but present in type '[number]'.
+  Property '0' is missing in type 'number[]' but present in type '[number]'.
 
 
 ==== tests/cases/conformance/types/tuple/strictTupleLength.ts (3 errors) ====
@@ -29,6 +29,6 @@ tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2322: Ty
     t1 = arr; // error with or without strict
     ~~
 !!! error TS2322: Type 'number[]' is not assignable to type '[number]'.
-!!! error TS2322:   Property '0' is missing in type number[]' but present in type '[number]'.
+!!! error TS2322:   Property '0' is missing in type 'number[]' but present in type '[number]'.
     arr = t1; // ok with or without strict
     
\ No newline at end of file
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
index f71f13f93ea82..b98686471382d 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
@@ -5,9 +5,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(31,5): error TS2411: Property 'c' of type 'number' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(32,5): error TS2411: Property 'd' of type 'string' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(37,8): error TS2322: Type 'typeof A' is not assignable to type 'A'.
-  Property 'foo' is missing in type typeof A' but present in type 'A'.
+  Property 'foo' is missing in type 'typeof A' but present in type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(38,8): error TS2322: Type 'typeof B' is not assignable to type 'A'.
-  Property 'foo' is missing in type typeof B' but present in type 'A'.
+  Property 'foo' is missing in type 'typeof B' but present in type 'A'.
 
 
 ==== tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts (8 errors) ====
@@ -62,11 +62,11 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
         a: A,
            ~
 !!! error TS2322: Type 'typeof A' is not assignable to type 'A'.
-!!! error TS2322:   Property 'foo' is missing in type typeof A' but present in type 'A'.
+!!! error TS2322:   Property 'foo' is missing in type 'typeof A' but present in type 'A'.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:37:8: Did you mean to use 'new' with this expression?
         b: B
            ~
 !!! error TS2322: Type 'typeof B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'foo' is missing in type typeof B' but present in type 'A'.
+!!! error TS2322:   Property 'foo' is missing in type 'typeof B' but present in type 'A'.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:38:8: Did you mean to use 'new' with this expression?
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
index edc797e87830b..624505ee79b4b 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts(11,11): error TS2430: Interface 'B' incorrectly extends interface 'A'.
   Index signatures are incompatible.
-    Property 'bar' is missing in type Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts(24,27): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts(32,15): error TS2430: Interface 'B3<T>' incorrectly extends interface 'A<T>'.
   Index signatures are incompatible.
@@ -28,7 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Index signatures are incompatible.
-!!! error TS2430:     Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2430:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
         [x: number]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
index b3c8f6f80e39f..3c629bb4e7904 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts(11,7): error TS2415: Class 'B' incorrectly extends base class 'A'.
   Index signatures are incompatible.
-    Property 'bar' is missing in type Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts(24,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts(32,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
@@ -28,7 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
           ~
 !!! error TS2415: Class 'B' incorrectly extends base class 'A'.
 !!! error TS2415:   Index signatures are incompatible.
-!!! error TS2415:     Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2415:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
         [x: number]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
index 5931bb55cea68..c67b353feb7c2 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
@@ -4,7 +4,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,11): error TS2415: Class 'B' incorrectly extends base class 'A<Base>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'Base'.
-tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,23): error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
+tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,23): error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(24,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -40,7 +40,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
-!!! error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived'.
             [x: number]: string; // error
         }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
index c8078b4983491..73795702ba886 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts(11,7): error TS2420: Class 'B' incorrectly implements interface 'A'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type Base' but present in type 'Derived'.
+      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts(32,11): error TS2420: Class 'B3<T>' incorrectly implements interface 'A<T>'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'T'.
@@ -29,7 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2420: Class 'B' incorrectly implements interface 'A'.
 !!! error TS2420:   Index signatures are incompatible.
 !!! error TS2420:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2420:       Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2420:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
index 630a21cf6e272..eb60996f43651 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts(17,15): error TS2430: Interface 'B' incorrectly extends interface 'A'.
   Types of property 'bar' are incompatible.
-    Property 'bar' is missing in type Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts(27,15): error TS2430: Interface 'B2' incorrectly extends interface 'A2'.
   Types of property '2.0' are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
@@ -39,7 +39,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
                   ~
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Types of property 'bar' are incompatible.
-!!! error TS2430:     Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2430:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
             foo: Derived; // ok
             bar: Base; // error
         }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
index b3dcf5a1bde16..4f59d1cb959c9 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(16,11): error TS2420: Class 'B' incorrectly implements interface 'A'.
-  Property 'foo' is missing in type B' but present in type 'A'.
+  Property 'foo' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(24,11): error TS2420: Class 'B2' incorrectly implements interface 'A2'.
-  Property '1' is missing in type B2' but present in type 'A2'.
+  Property '1' is missing in type 'B2' but present in type 'A2'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(32,11): error TS2420: Class 'B3' incorrectly implements interface 'A3'.
-  Property ''1'' is missing in type B3' but present in type 'A3'.
+  Property ''1'' is missing in type 'B3' but present in type 'A3'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(43,11): error TS2559: Type 'B' has no properties in common with type 'A'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(51,11): error TS2559: Type 'B2' has no properties in common with type 'A2'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts(59,11): error TS2559: Type 'B3' has no properties in common with type 'A3'.
@@ -28,7 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
         class B implements A {
               ~
 !!! error TS2420: Class 'B' incorrectly implements interface 'A'.
-!!! error TS2420:   Property 'foo' is missing in type B' but present in type 'A'.
+!!! error TS2420:   Property 'foo' is missing in type 'B' but present in type 'A'.
             fooo: Derived; // error
         }
     
@@ -39,7 +39,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
         class B2 implements A2 {
               ~~
 !!! error TS2420: Class 'B2' incorrectly implements interface 'A2'.
-!!! error TS2420:   Property '1' is missing in type B2' but present in type 'A2'.
+!!! error TS2420:   Property '1' is missing in type 'B2' but present in type 'A2'.
             2: Derived; // error
         }
     
@@ -50,7 +50,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
         class B3 implements A3 {
               ~~
 !!! error TS2420: Class 'B3' incorrectly implements interface 'A3'.
-!!! error TS2420:   Property ''1'' is missing in type B3' but present in type 'A3'.
+!!! error TS2420:   Property ''1'' is missing in type 'B3' but present in type 'A3'.
             '1.0': Derived; // error
         }
     }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
index 5ee0ecf3888d5..970a56ba9c2da 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts(11,11): error TS2430: Interface 'B' incorrectly extends interface 'A'.
   Index signatures are incompatible.
-    Property 'bar' is missing in type Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts(24,27): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts(32,15): error TS2430: Interface 'B3<T>' incorrectly extends interface 'A<T>'.
   Index signatures are incompatible.
@@ -28,7 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Index signatures are incompatible.
-!!! error TS2430:     Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2430:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
index cae4456ac385b..76d2542e42873 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts(11,7): error TS2415: Class 'B' incorrectly extends base class 'A'.
   Index signatures are incompatible.
-    Property 'bar' is missing in type Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts(24,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts(32,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
@@ -28,7 +28,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
           ~
 !!! error TS2415: Class 'B' incorrectly extends base class 'A'.
 !!! error TS2415:   Index signatures are incompatible.
-!!! error TS2415:     Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2415:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
index 3c17778cd20a6..895f605bd68e5 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
@@ -4,7 +4,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,11): error TS2415: Class 'B' incorrectly extends base class 'A<Base>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'Base'.
-tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,23): error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
+tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,23): error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(24,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -40,7 +40,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
-!!! error TS2737: Property 'bar' is missing in type Base' but present in type 'Derived'.
+!!! error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived'.
             [x: string]: string; // error
         }
     
diff --git a/tests/baselines/reference/symbolProperty10.errors.txt b/tests/baselines/reference/symbolProperty10.errors.txt
index c23714712d311..3d54347789e5f 100644
--- a/tests/baselines/reference/symbolProperty10.errors.txt
+++ b/tests/baselines/reference/symbolProperty10.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Type 'I' is not assignable to type 'C'.
   Types of property '[Symbol.iterator]' are incompatible.
     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-      Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
+      Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty10.ts (1 errors) ====
@@ -19,4 +19,4 @@ tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Typ
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
 !!! error TS2322:     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-!!! error TS2322:       Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
+!!! error TS2322:       Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolProperty25.errors.txt b/tests/baselines/reference/symbolProperty25.errors.txt
index 238fd635a2421..05047ccfc3329 100644
--- a/tests/baselines/reference/symbolProperty25.errors.txt
+++ b/tests/baselines/reference/symbolProperty25.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/Symbols/symbolProperty25.ts(5,7): error TS2420: Class 'C' incorrectly implements interface 'I'.
-  Property '[Symbol.toPrimitive]' is missing in type C' but present in type 'I'.
+  Property '[Symbol.toPrimitive]' is missing in type 'C' but present in type 'I'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty25.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty25.ts(5,7): error TS2420: Clas
     class C implements I {
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
-!!! error TS2420:   Property '[Symbol.toPrimitive]' is missing in type C' but present in type 'I'.
+!!! error TS2420:   Property '[Symbol.toPrimitive]' is missing in type 'C' but present in type 'I'.
         [Symbol.toStringTag]() {
             return "";
         }
diff --git a/tests/baselines/reference/symbolProperty52.errors.txt b/tests/baselines/reference/symbolProperty52.errors.txt
index f30fa5aa75fd2..6296223b9cc31 100644
--- a/tests/baselines/reference/symbolProperty52.errors.txt
+++ b/tests/baselines/reference/symbolProperty52.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(2,13): error TS2339: Property 'nonsense' does not exist on type 'SymbolConstructor'.
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(5,1): error TS2322: Type '{}' is not assignable to type '{ [Symbol.nonsense]: number; }'.
-  Property '[Symbol.nonsense]' is missing in type {}' but present in type '{ [Symbol.nonsense]: number; }'.
+  Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Property 'nonsense' does not exist on type 'SymbolConstructor'.
 
 
@@ -14,7 +14,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Pro
     obj = {};
     ~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ [Symbol.nonsense]: number; }'.
-!!! error TS2322:   Property '[Symbol.nonsense]' is missing in type {}' but present in type '{ [Symbol.nonsense]: number; }'.
+!!! error TS2322:   Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
     
     obj[Symbol.nonsense];
                ~~~~~~~~
diff --git a/tests/baselines/reference/symbolProperty9.errors.txt b/tests/baselines/reference/symbolProperty9.errors.txt
index 2796e4a3ba9e1..d3d9d870e0306 100644
--- a/tests/baselines/reference/symbolProperty9.errors.txt
+++ b/tests/baselines/reference/symbolProperty9.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type 'I' is not assignable to type 'C'.
   Types of property '[Symbol.iterator]' are incompatible.
     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-      Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
+      Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty9.ts (1 errors) ====
@@ -19,4 +19,4 @@ tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
 !!! error TS2322:     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-!!! error TS2322:       Property 'y' is missing in type { x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
+!!! error TS2322:       Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
index 07111aaaccbb0..aec641c28568f 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(9,13): error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
+tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(9,13): error TS2737: Property 'raw' is missing in type 'undefined[]' but present in type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(10,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(11,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(12,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
@@ -19,7 +19,7 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     
     var a = foo([]);             // number
                 ~~
-!!! error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
+!!! error TS2737: Property 'raw' is missing in type 'undefined[]' but present in type 'TemplateStringsArray'.
     var b = foo([], 1);          // string
                 ~~
 !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
index 88a3ff4c628a5..1218ceebb2492 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(9,13): error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
+tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(9,13): error TS2737: Property 'raw' is missing in type 'undefined[]' but present in type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(10,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(11,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(12,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
@@ -19,7 +19,7 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     
     var a = foo([]);             // number
                 ~~
-!!! error TS2737: Property 'raw' is missing in type undefined[]' but present in type 'TemplateStringsArray'.
+!!! error TS2737: Property 'raw' is missing in type 'undefined[]' but present in type 'TemplateStringsArray'.
     var b = foo([], 1);          // string
                 ~~
 !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
index d89032b821530..a4fb832007451 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -16,7 +16,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(67,1): err
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(68,1): error TS2684: The 'this' context of type '{ y: string; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
   Types of property 'y' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2737: Property 'y' is missing in type { wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2737: Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(72,1): error TS2554: Expected 1 arguments, but got 0.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(73,13): error TS2345: Argument of type '"wrong type"' is not assignable to parameter of type 'number'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(74,1): error TS2554: Expected 1 arguments, but got 2.
@@ -39,7 +39,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(107,1): er
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(108,1): error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type '{ n: number; }' is not assignable to type '{ x: number; }'.
-      Property 'x' is missing in type { n: number; }' but present in type '{ x: number; }'.
+      Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(110,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type 'C' is not assignable to type 'D'.
@@ -67,7 +67,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(125,69): e
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(145,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
   The 'this' types of each signature are incompatible.
     Type 'Base1' is not assignable to type 'Base2'.
-      Property 'y' is missing in type Base1' but present in type 'Base2'.
+      Property 'y' is missing in type 'Base1' but present in type 'Base2'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(146,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
   The 'this' types of each signature are incompatible.
     Type 'Base1' is not assignable to type 'Base2'.
@@ -201,7 +201,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2684:     Type 'string' is not assignable to type 'number'.
     wrongPropertyName.f(13);
     ~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'y' is missing in type { wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
+!!! error TS2737: Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
     
     let c = new C();
     c.explicitC(); // not enough arguments
@@ -282,7 +282,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type '{ n: number; }' is not assignable to type '{ x: number; }'.
-!!! error TS2322:       Property 'x' is missing in type { n: number; }' but present in type '{ x: number; }'.
+!!! error TS2322:       Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
     
     c.explicitC = d.explicitD;
     ~~~~~~~~~~~
@@ -357,7 +357,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type 'Base1' is not assignable to type 'Base2'.
-!!! error TS2322:       Property 'y' is missing in type Base1' but present in type 'Base2'.
+!!! error TS2322:       Property 'y' is missing in type 'Base1' but present in type 'Base2'.
     b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
     ~~~~~~~~~~~
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
diff --git a/tests/baselines/reference/tsxAttributeResolution1.errors.txt b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
index e969584dbefb0..dc9ac0654c18a 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/jsx/file.tsx(26,8): error TS2322: Type 'string' is not a
 tests/cases/conformance/jsx/file.tsx(27,2): error TS2322: Type '{ var: string; }' is not assignable to type 'Attribs1'.
   Property 'var' does not exist on type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
-  Property 'reqd' is missing in type {}' but present in type '{ reqd: string; }'.
+  Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
 tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -58,7 +58,7 @@ tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not a
     <test2 />; // Error, missing reqd
      ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
-!!! error TS2322:   Property 'reqd' is missing in type {}' but present in type '{ reqd: string; }'.
+!!! error TS2322:   Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
     <test2 reqd={10} />; // Error, reqd is not string
            ~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxAttributeResolution12.errors.txt b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
index 24bce229659ca..1210ae5d2ad2a 100644
--- a/tests/baselines/reference/tsxAttributeResolution12.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/jsx/file.tsx(25,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
   Type '{}' is not assignable to type '{ reqd: any; }'.
-    Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
+    Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
 tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
   Type '{}' is not assignable to type '{ reqd: any; }'.
-    Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
+    Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
 
 
 ==== tests/cases/conformance/jsx/react.d.ts (0 errors) ====
@@ -48,13 +48,13 @@ tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assi
               ~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ reqd: any; }'.
-!!! error TS2322:     Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
+!!! error TS2322:     Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
     
     // Should error
     var t2 = <TestMod.Test />;
               ~~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ reqd: any; }'.
-!!! error TS2322:     Property 'reqd' is missing in type {}' but present in type '{ reqd: any; }'.
+!!! error TS2322:     Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution3.errors.txt b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
index b19cd59769ff4..58f5db4a5162d 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/jsx/file.tsx(19,2): error TS2322: Type '{ x: number; }'
   Types of property 'x' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(23,2): error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'.
-  Property 'x' is missing in type { y: number; }' but present in type 'Attribs1'.
+  Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -36,7 +36,7 @@ tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not a
     <test1 {...obj3} />
      ~~~~~
 !!! error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Property 'x' is missing in type { y: number; }' but present in type 'Attribs1'.
+!!! error TS2322:   Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
     
     // OK
     var obj4 = { x: 32, y: 32 };
diff --git a/tests/baselines/reference/tsxAttributeResolution5.errors.txt b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
index e101ac06a5b0f..23c3cb556f0d2 100644
--- a/tests/baselines/reference/tsxAttributeResolution5.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
@@ -4,9 +4,9 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type 'T' is not assig
       Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(25,10): error TS2322: Type 'T' is not assignable to type 'Attribs1'.
   Type '{ y: string; }' is not assignable to type 'Attribs1'.
-    Property 'x' is missing in type { y: string; }' but present in type 'Attribs1'.
+    Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assignable to type 'Attribs1'.
-  Property 'x' is missing in type {}' but present in type 'Attribs1'.
+  Property 'x' is missing in type '{}' but present in type 'Attribs1'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -43,13 +43,13 @@ tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assig
     	        ~~~~~
 !!! error TS2322: Type 'T' is not assignable to type 'Attribs1'.
 !!! error TS2322:   Type '{ y: string; }' is not assignable to type 'Attribs1'.
-!!! error TS2322:     Property 'x' is missing in type { y: string; }' but present in type 'Attribs1'.
+!!! error TS2322:     Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
     }
     
     
     <test1 {...{}} />; // Error, missing x
      ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Property 'x' is missing in type {}' but present in type 'Attribs1'.
+!!! error TS2322:   Property 'x' is missing in type '{}' but present in type 'Attribs1'.
     <test2 {...{}} />; // Error, missing toString
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution6.errors.txt b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
index e37172eea92af..902330d5e7a34 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/jsx/file.tsx(10,8): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(11,8): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(12,2): error TS2322: Type '{}' is not assignable to type '{ n: boolean; }'.
-  Property 'n' is missing in type {}' but present in type '{ n: boolean; }'.
+  Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -25,7 +25,7 @@ tests/cases/conformance/jsx/file.tsx(12,2): error TS2322: Type '{}' is not assig
     <test2 />;
      ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ n: boolean; }'.
-!!! error TS2322:   Property 'n' is missing in type {}' but present in type '{ n: boolean; }'.
+!!! error TS2322:   Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
     
     // OK
     <test1 n />;
diff --git a/tests/baselines/reference/tsxInvokeComponentType.errors.txt b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
index fed68d449a614..dc7997024ab08 100644
--- a/tests/baselines/reference/tsxInvokeComponentType.errors.txt
+++ b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { someKey: string; } & { children?: ReactNode; }'.
   Type '{}' is not assignable to type '{ someKey: string; }'.
-    Property 'someKey' is missing in type {}' but present in type '{ someKey: string; }'.
+    Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
 
 
 ==== tests/cases/compiler/tsxInvokeComponentType.tsx (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2322: Type '{}' i
                  ~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { someKey: string; } & { children?: ReactNode; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ someKey: string; }'.
-!!! error TS2322:     Property 'someKey' is missing in type {}' but present in type '{ someKey: string; }'.
+!!! error TS2322:     Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
     
     const good = <Elem someKey="ok" />;
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
index 65081baacb135..83d86734ca8cd 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/jsx/file.tsx(11,10): error TS2322: Type '{ property1: string; property2: number; }' is not assignable to type 'AnotherComponentProps'.
-  Property 'AnotherProperty1' is missing in type { property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
+  Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/conformance/jsx/file.tsx(11,10): error TS2322: Type '{ property1: st
             <AnotherComponent {...props} />
              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ property1: string; property2: number; }' is not assignable to type 'AnotherComponentProps'.
-!!! error TS2322:   Property 'AnotherProperty1' is missing in type { property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
+!!! error TS2322:   Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
         );
     }
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
index 0dbc56106a77c..495860b3dd3d6 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
   Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; }'.
     Type '{ editable: true; }' is not assignable to type '{ editable: true; onEdit: (newText: string) => void; }'.
-      Property 'onEdit' is missing in type { editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
+      Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -22,7 +22,7 @@ tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: tru
 !!! error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
 !!! error TS2322:   Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; }'.
 !!! error TS2322:     Type '{ editable: true; }' is not assignable to type '{ editable: true; onEdit: (newText: string) => void; }'.
-!!! error TS2322:       Property 'onEdit' is missing in type { editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
+!!! error TS2322:       Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
     
     const textProps: TextProps = {
         editable: false
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
index f4f87f1145edd..1e04bceda2067 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/jsx/file.tsx(12,13): error TS2322: Type '{ extraProp: tr
   Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
 tests/cases/conformance/jsx/file.tsx(13,13): error TS2322: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
   Type '{ yy: number; }' is not assignable to type '{ yy: number; yy1: string; }'.
-    Property 'yy1' is missing in type { yy: number; }' but present in type '{ yy: number; yy1: string; }'.
+    Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
 tests/cases/conformance/jsx/file.tsx(14,31): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(16,13): error TS2322: Type '{ y1: number; yy: number; yy1: string; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
   Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
@@ -11,7 +11,7 @@ tests/cases/conformance/jsx/file.tsx(17,13): error TS2322: Type '{ yy: boolean;
     Type 'boolean' is not assignable to type 'number'.
 tests/cases/conformance/jsx/file.tsx(25,13): error TS2322: Type '{ extra-data: true; }' is not assignable to type 'IntrinsicAttributes & { yy: string; direction?: number; }'.
   Type '{ extra-data: true; }' is not assignable to type '{ yy: string; direction?: number; }'.
-    Property 'yy' is missing in type { extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
+    Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
 tests/cases/conformance/jsx/file.tsx(26,40): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/jsx/file.tsx(33,32): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(34,29): error TS2322: Type 'string' is not assignable to type 'boolean'.
@@ -38,7 +38,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
                 ~~~~~~~~
 !!! error TS2322: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
 !!! error TS2322:   Type '{ yy: number; }' is not assignable to type '{ yy: number; yy1: string; }'.
-!!! error TS2322:     Property 'yy1' is missing in type { yy: number; }' but present in type '{ yy: number; yy1: string; }'.
+!!! error TS2322:     Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
     const c2 = <OneThing {...obj} yy1 />; // type incompatible;
                                   ~~~
 !!! error TS2322: Type 'true' is not assignable to type 'string'.
@@ -64,7 +64,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
                 ~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ extra-data: true; }' is not assignable to type 'IntrinsicAttributes & { yy: string; direction?: number; }'.
 !!! error TS2322:   Type '{ extra-data: true; }' is not assignable to type '{ yy: string; direction?: number; }'.
-!!! error TS2322:     Property 'yy' is missing in type { extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
+!!! error TS2322:     Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
     const d2 = <TestingOneThing yy="hello" direction="left" />
                                            ~~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
index 8229c54772ac4..f6817fe44b553 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/jsx/file.tsx(29,10): error TS2322: Type '{ naaaaaaame: s
   Property 'naaaaaaame' does not exist on type 'IntrinsicAttributes & { name?: string; }'.
 tests/cases/conformance/jsx/file.tsx(34,10): error TS2322: Type '{ extra-prop-name: string; }' is not assignable to type 'IntrinsicAttributes & { "prop-name": string; }'.
   Type '{ extra-prop-name: string; }' is not assignable to type '{ "prop-name": string; }'.
-    Property '"prop-name"' is missing in type { extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
+    Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
 tests/cases/conformance/jsx/file.tsx(37,10): error TS2322: Type '{ prop1: true; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'prop1' does not exist on type 'IntrinsicAttributes'.
 tests/cases/conformance/jsx/file.tsx(38,11): error TS2322: Type '{ ref: (x: any) => any; }' is not assignable to type 'IntrinsicAttributes'.
@@ -60,7 +60,7 @@ tests/cases/conformance/jsx/file.tsx(45,11): error TS2559: Type '{ prop1: boolea
              ~~~~~~~~~~~~
 !!! error TS2322: Type '{ extra-prop-name: string; }' is not assignable to type 'IntrinsicAttributes & { "prop-name": string; }'.
 !!! error TS2322:   Type '{ extra-prop-name: string; }' is not assignable to type '{ "prop-name": string; }'.
-!!! error TS2322:     Property '"prop-name"' is missing in type { extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
+!!! error TS2322:     Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
     
     // Error
     let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
index b5693849e9e52..4606c1e1bc432 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/jsx/file.tsx(9,15): error TS2322: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: number; }'.
   Type '{ a: number; }' is not assignable to type '{ b: {}; a: number; }'.
-    Property 'b' is missing in type { a: number; }' but present in type '{ b: {}; a: number; }'.
+    Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
 tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
   Type 'T & { ignore-prop: true; }' is not assignable to type '{ b: {}; a: {}; }'.
-    Property 'a' is missing in type { b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
+    Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (2 errors) ====
@@ -19,10 +19,10 @@ tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-pr
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: number; }'.
 !!! error TS2322:   Type '{ a: number; }' is not assignable to type '{ b: {}; a: number; }'.
-!!! error TS2322:     Property 'b' is missing in type { a: number; }' but present in type '{ b: {}; a: number; }'.
+!!! error TS2322:     Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
         let a2 = <OverloadComponent {...arg1} ignore-prop />  // missing a
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
 !!! error TS2322:   Type 'T & { ignore-prop: true; }' is not assignable to type '{ b: {}; a: {}; }'.
-!!! error TS2322:     Property 'a' is missing in type { b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
+!!! error TS2322:     Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxUnionElementType6.errors.txt b/tests/baselines/reference/tsxUnionElementType6.errors.txt
index 766b25e587fb1..13b2ea60e0763 100644
--- a/tests/baselines/reference/tsxUnionElementType6.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType6.errors.txt
@@ -3,10 +3,10 @@ tests/cases/conformance/jsx/file.tsx(18,10): error TS2322: Type '{ x: true; }' i
 tests/cases/conformance/jsx/file.tsx(19,27): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
   Type '{}' is not assignable to type '{ x: boolean; }'.
-    Property 'x' is missing in type {}' but present in type '{ x: boolean; }'.
+    Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
 tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{ data-prop: true; }' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
   Type '{ data-prop: true; }' is not assignable to type '{ x: boolean; }'.
-    Property 'x' is missing in type { data-prop: true; }' but present in type '{ x: boolean; }'.
+    Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (4 errors) ====
@@ -39,11 +39,11 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{ data-prop: tr
              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
 !!! error TS2322:   Type '{}' is not assignable to type '{ x: boolean; }'.
-!!! error TS2322:     Property 'x' is missing in type {}' but present in type '{ x: boolean; }'.
+!!! error TS2322:     Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
     let d = <SFC2AndEmptyComp data-prop />;
              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ data-prop: true; }' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
 !!! error TS2322:   Type '{ data-prop: true; }' is not assignable to type '{ x: boolean; }'.
-!!! error TS2322:     Property 'x' is missing in type { data-prop: true; }' but present in type '{ x: boolean; }'.
+!!! error TS2322:     Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tupleTypes.errors.txt b/tests/baselines/reference/tupleTypes.errors.txt
index 1b27e7afff0de..883bfed56f16b 100644
--- a/tests/baselines/reference/tupleTypes.errors.txt
+++ b/tests/baselines/reference/tupleTypes.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/tupleTypes.ts(12,5): error TS2403: Subsequent variable decl
 tests/cases/compiler/tupleTypes.ts(14,1): error TS2322: Type '[]' is not assignable to type '[number, string]'.
   Type '[]' is missing the following properties from type '[number, string]': 0, 1
 tests/cases/compiler/tupleTypes.ts(15,1): error TS2322: Type '[number]' is not assignable to type '[number, string]'.
-  Property '1' is missing in type [number]' but present in type '[number, string]'.
+  Property '1' is missing in type '[number]' but present in type '[number, string]'.
 tests/cases/compiler/tupleTypes.ts(17,6): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/tupleTypes.ts(17,15): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/tupleTypes.ts(18,1): error TS2322: Type '[number, string, number]' is not assignable to type '[number, string]'.
@@ -49,7 +49,7 @@ tests/cases/compiler/tupleTypes.ts(51,1): error TS2322: Type '[number, {}]' is n
     t = [1];              // Error
     ~
 !!! error TS2322: Type '[number]' is not assignable to type '[number, string]'.
-!!! error TS2322:   Property '1' is missing in type [number]' but present in type '[number, string]'.
+!!! error TS2322:   Property '1' is missing in type '[number]' but present in type '[number, string]'.
     t = [1, "hello"];     // Ok
     t = ["hello", 1];     // Error
          ~~~~~~~
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
index f4601baa60dcc..1bbf22a9fb72b 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression2.ts(6,5): error TS2345: Argument of type 'typeof (Anonymous class)' is not assignable to parameter of type 'typeof (Anonymous class)'.
-  Property 'prop' is missing in type (Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
+  Property 'prop' is missing in type '(Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
 
 
 ==== tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression2.ts (1 errors) ====
@@ -11,4 +11,4 @@ tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpre
     foo(class { static prop = "hello" }).length;
         ~~~~~
 !!! error TS2345: Argument of type 'typeof (Anonymous class)' is not assignable to parameter of type 'typeof (Anonymous class)'.
-!!! error TS2345:   Property 'prop' is missing in type (Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
\ No newline at end of file
+!!! error TS2345:   Property 'prop' is missing in type '(Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
index b9e1dd3587835..1454635bd4173 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2737: Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
+tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2737: Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
 
 
 ==== tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts (1 errors) ====
@@ -10,4 +10,4 @@ tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): er
     var e: Elephant;
     f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
          ~
-!!! error TS2737: Property 'y' is missing in type Elephant' but present in type 'Giraffe'.
\ No newline at end of file
+!!! error TS2737: Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index f1fe065d216d3..ca9a33f5e400b 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(5,9): error TS2558: Expected 0 type arguments, but got 1.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2737: Property 'p' is missing in type 'SomeOther' but present in type 'SomeBase'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2735: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2737: Property 'q' is missing in type 'SomeDerived' but present in type 'SomeOther'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2737: Property 'q' is missing in type 'SomeBase' but present in type 'SomeOther'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,5): error TS2304: Cannot find name 'numOrStr'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS1005: '>' expected.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS2304: Cannot find name 'is'.
@@ -54,7 +54,7 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     someBase = <SomeBase>someBase;
     someBase = <SomeBase>someOther; // Error
                ~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'p' is missing in type SomeOther' but present in type 'SomeBase'.
+!!! error TS2737: Property 'p' is missing in type 'SomeOther' but present in type 'SomeBase'.
     
     someDerived = <SomeDerived>someDerived;
     someDerived = <SomeDerived>someBase;
@@ -64,10 +64,10 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     
     someOther = <SomeOther>someDerived; // Error
                 ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'q' is missing in type SomeDerived' but present in type 'SomeOther'.
+!!! error TS2737: Property 'q' is missing in type 'SomeDerived' but present in type 'SomeOther'.
     someOther = <SomeOther>someBase; // Error
                 ~~~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'q' is missing in type SomeBase' but present in type 'SomeOther'.
+!!! error TS2737: Property 'q' is missing in type 'SomeBase' but present in type 'SomeOther'.
     someOther = <SomeOther>someOther;
     
     // Type assertion cannot be a type-predicate type
diff --git a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
index 0bee9c9aab888..2c7a106ff2060 100644
--- a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
+++ b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts(17,9): error TS2352: Conversion of type 'I2' to type 'I1 & I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Property 'p3' is missing in type I2' but present in type 'I3'.
+  Property 'p3' is missing in type 'I2' but present in type 'I3'.
 tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts(18,9): error TS2352: Conversion of type 'I2' to type 'I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 
 
@@ -23,7 +23,7 @@ tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithInt
     var a = <I1 & I3>z;
             ~~~~~~~~~~
 !!! error TS2352: Conversion of type 'I2' to type 'I1 & I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-!!! error TS2352:   Property 'p3' is missing in type I2' but present in type 'I3'.
+!!! error TS2352:   Property 'p3' is missing in type 'I2' but present in type 'I3'.
     var b = <I3>z;
             ~~~~~
 !!! error TS2352: Conversion of type 'I2' to type 'I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
index 4ed2aeacd96fb..88ad446b60a2e 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
@@ -12,7 +12,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(31,1):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(33,38): error TS1225: Cannot find parameter 'x'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(37,51): error TS2677: A type predicate's type must be assignable to its parameter's type.
   Type 'B' is not assignable to type 'A'.
-    Property 'propA' is missing in type B' but present in type 'A'.
+    Property 'propA' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(41,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
   Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(45,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
@@ -22,7 +22,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(64,7):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(69,7): error TS2551: Property 'propB' does not exist on type 'A'. Did you mean 'propA'?
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(74,46): error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'.
   Type predicate 'p1 is C' is not assignable to 'p1 is B'.
-    Property 'propB' is missing in type C' but present in type 'B'.
+    Property 'propB' is missing in type 'C' but present in type 'B'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(78,1): error TS2322: Type '(p1: any, p2: any) => boolean' is not assignable to type '(p1: any, p2: any) => p1 is A'.
   Signature '(p1: any, p2: any): boolean' must be a type predicate.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(84,1): error TS2322: Type '(p1: any, p2: any) => p2 is A' is not assignable to type '(p1: any, p2: any) => p1 is A'.
@@ -134,7 +134,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
                                                       ~
 !!! error TS2677: A type predicate's type must be assignable to its parameter's type.
 !!! error TS2677:   Type 'B' is not assignable to type 'A'.
-!!! error TS2677:     Property 'propA' is missing in type B' but present in type 'A'.
+!!! error TS2677:     Property 'propA' is missing in type 'B' but present in type 'A'.
         return true;
     }
     
@@ -190,7 +190,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
                                                  ~~~
 !!! error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'.
 !!! error TS2345:   Type predicate 'p1 is C' is not assignable to 'p1 is B'.
-!!! error TS2345:     Property 'propB' is missing in type C' but present in type 'B'.
+!!! error TS2345:     Property 'propB' is missing in type 'C' but present in type 'B'.
     
     // Boolean not assignable to type guard
     var assign1: (p1, p2) => p1 is A;
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
index 653a5e93e30f8..87be0299959e8 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(23,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
-      Property 'follow' is missing in type LeadGuard' but present in type 'FollowerGuard'.
+      Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(24,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
     Type 'FollowerGuard' is not assignable to type 'LeadGuard'.
-      Property 'lead' is missing in type FollowerGuard' but present in type 'LeadGuard'.
+      Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(26,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
@@ -45,13 +45,13 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors
 !!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
 !!! error TS2322:   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
 !!! error TS2322:     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
-!!! error TS2322:       Property 'follow' is missing in type LeadGuard' but present in type 'FollowerGuard'.
+!!! error TS2322:       Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
     b.isLeader = b.isFollower;
     ~~~~~~~~~~
 !!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
 !!! error TS2322:   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
 !!! error TS2322:     Type 'FollowerGuard' is not assignable to type 'LeadGuard'.
-!!! error TS2322:       Property 'lead' is missing in type FollowerGuard' but present in type 'LeadGuard'.
+!!! error TS2322:       Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
     
     a.isFollower = a.isLeader;
     ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/typeMatch1.errors.txt b/tests/baselines/reference/typeMatch1.errors.txt
index 3b038023a3c05..87dc0df8727e0 100644
--- a/tests/baselines/reference/typeMatch1.errors.txt
+++ b/tests/baselines/reference/typeMatch1.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/typeMatch1.ts(18,1): error TS2322: Type 'D' is not assignable to type 'C'.
   Types have separate declarations of a private property 'x'.
 tests/cases/compiler/typeMatch1.ts(19,4): error TS2322: Type 'typeof C' is not assignable to type 'C'.
-  Property 'x' is missing in type typeof C' but present in type 'C'.
+  Property 'x' is missing in type 'typeof C' but present in type 'C'.
 tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will always return 'false' since the types 'typeof C' and 'typeof D' have no overlap.
 
 
@@ -30,7 +30,7 @@ tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will alwa
     x6=C;
        ~
 !!! error TS2322: Type 'typeof C' is not assignable to type 'C'.
-!!! error TS2322:   Property 'x' is missing in type typeof C' but present in type 'C'.
+!!! error TS2322:   Property 'x' is missing in type 'typeof C' but present in type 'C'.
 !!! related TS6213 tests/cases/compiler/typeMatch1.ts:19:4: Did you mean to use 'new' with this expression?
     C==D;
     ~~~~
diff --git a/tests/baselines/reference/typeMatch2.errors.txt b/tests/baselines/reference/typeMatch2.errors.txt
index d60d90f3a49f5..880a858939c0e 100644
--- a/tests/baselines/reference/typeMatch2.errors.txt
+++ b/tests/baselines/reference/typeMatch2.errors.txt
@@ -1,21 +1,21 @@
 tests/cases/compiler/typeMatch2.ts(3,2): error TS2322: Type '{}' is not assignable to type '{ x: number; y: number; }'.
   Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
 tests/cases/compiler/typeMatch2.ts(4,5): error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-  Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
+  Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(5,20): error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(6,17): error TS2322: Type '{ x: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(18,5): error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
   Type 'Animal' is not assignable to type 'Giraffe'.
-    Property 'g' is missing in type Animal' but present in type 'Giraffe'.
+    Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
 tests/cases/compiler/typeMatch2.ts(22,5): error TS2322: Type '{ f1: number; f2: Animal[]; }' is not assignable to type '{ f1: number; f2: Giraffe[]; }'.
   Types of property 'f2' are incompatible.
     Type 'Animal[]' is not assignable to type 'Giraffe[]'.
 tests/cases/compiler/typeMatch2.ts(34,26): error TS2322: Type '{ x: number; y: any; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-  Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
+  Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
 
 
 ==== tests/cases/compiler/typeMatch2.ts (8 errors) ====
@@ -28,7 +28,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
         a = { x: 1 }; // error
         ~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
+!!! error TS2322:   Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
     	a = { x: 1, y: 2, z: 3 };
     	                  ~~~~
 !!! error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
@@ -52,7 +52,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
         ~~
 !!! error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
 !!! error TS2322:   Type 'Animal' is not assignable to type 'Giraffe'.
-!!! error TS2322:     Property 'g' is missing in type Animal' but present in type 'Giraffe'.
+!!! error TS2322:     Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
         var xa = { f1: 5, f2: aa };
         var xb = { f1: 5, f2: gg };
         xa = xb; // Should be ok
@@ -79,7 +79,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
         a = { x: 1 }; // error
         ~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'y' is missing in type { x: number; }' but present in type '{ x: number; y: number; }'.
+!!! error TS2322:   Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
         var mf = function m(n) { return false; };
         var zf = function z(n: number) { return true; };
         mf=zf;
diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
index 6a882a9d902c3..96d6b1768edb4 100644
--- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
+++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(13,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(15,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2737: Property 'b' is missing in type I1' but present in type 'I2'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: number; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: number; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2737: Property 'b' is missing in type 'I1' but present in type 'I2'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
 
 
@@ -26,7 +26,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     // Below should be in error
     var x1: A<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
-!!! error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
+!!! error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
     var x2: A<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
 !!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
@@ -34,7 +34,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
 !!! error TS2344:     Type 'number' is not assignable to type 'string'.
     var x3: B<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
-!!! error TS2737: Property 'a' is missing in type { b: string; }' but present in type '{ a: string; }'.
+!!! error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
     var x4: B<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
 !!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
@@ -42,10 +42,10 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
 !!! error TS2344:     Type 'number' is not assignable to type 'string'.
     var x5: A<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
-!!! error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: number; }'.
     var x6: B<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
-!!! error TS2737: Property 'b' is missing in type { a: string; }' but present in type '{ a: string; b: number; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: number; }'.
     
     interface I1 {
         a: string;
@@ -58,7 +58,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     
     var x7: A<I2, I1>;
                   ~~
-!!! error TS2737: Property 'b' is missing in type I1' but present in type 'I2'.
+!!! error TS2737: Property 'b' is missing in type 'I1' but present in type 'I2'.
     var x8: B<I2, I1>;
                   ~~
 !!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
index 509115ce59783..b944456242340 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'b' is missing in type A' but present in type 'B'.
+  Property 'b' is missing in type 'A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts (1 errors) ====
@@ -12,5 +12,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30):
     var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
                                  ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
 !!! 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 bb01ad4559043..a9d5b1bbcb795 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'b' is missing in type A' but present in type 'B'.
+  Property 'b' is missing in type 'A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts (1 errors) ====
@@ -12,5 +12,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35):
     var d = f(a, b, u2 => u2.b, t2 => t2);
                                       ~~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'b' is missing in type A' but present in type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
 !!! 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/typedefMultipleTypeParameters.errors.txt b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
index fef4faf19117f..1f1c5b039100d 100644
--- a/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
+++ b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/conformance/jsdoc/a.js(12,23): error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
+tests/cases/conformance/jsdoc/a.js(12,23): error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
 tests/cases/conformance/jsdoc/a.js(15,12): error TS2314: Generic type 'Everything' requires 5 type argument(s).
-tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
+tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
 
 
 ==== tests/cases/conformance/jsdoc/a.js (2 errors) ====
@@ -17,7 +17,7 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missi
     
     /** @type {Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>} */
                           ~~~~~~~~~~~~~~
-!!! error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
     var wrong;
     
     /** @type {Everything<{ a: number  }>} */
@@ -28,5 +28,5 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missi
 ==== tests/cases/conformance/jsdoc/test.ts (1 errors) ====
     declare var actually: Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>;
                                      ~~~~~~~~~~~~~~
-!!! error TS2737: Property 'b' is missing in type { a: number; }' but present in type '{ a: number; b: string; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
index 2bacf93fbe117..02d112a05c519 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/typeofAmbientExternalModules_2.ts(7,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-  Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+  Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
 tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
+  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
 
 
 ==== tests/cases/compiler/typeofAmbientExternalModules_2.ts (2 errors) ====
@@ -14,12 +14,12 @@ tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type
     y1 = exp;
     ~~
 !!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-!!! error TS2322:   Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+!!! error TS2322:   Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
 !!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
+!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
 ==== tests/cases/compiler/typeofAmbientExternalModules_0.ts (0 errors) ====
     export class C { foo: string; }
     
diff --git a/tests/baselines/reference/typeofExternalModules.errors.txt b/tests/baselines/reference/typeofExternalModules.errors.txt
index 7cd5e2b856c6c..2692c88b81064 100644
--- a/tests/baselines/reference/typeofExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofExternalModules.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/typeofExternalModules_core.ts(5,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-  Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+  Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
 tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
+  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
 
 
 ==== tests/cases/compiler/typeofExternalModules_core.ts (2 errors) ====
@@ -12,12 +12,12 @@ tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typ
     y1 = exp;
     ~~
 !!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-!!! error TS2322:   Property 'C' is missing in type typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+!!! error TS2322:   Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
 !!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
+!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
 ==== tests/cases/compiler/typeofExternalModules_external.ts (0 errors) ====
     export class C { }
     
diff --git a/tests/baselines/reference/typeofInternalModules.errors.txt b/tests/baselines/reference/typeofInternalModules.errors.txt
index 8268c5e684aa9..d3273b190441f 100644
--- a/tests/baselines/reference/typeofInternalModules.errors.txt
+++ b/tests/baselines/reference/typeofInternalModules.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/typeofInternalModules.ts(15,16): error TS2708: Cannot use namespace 'importUninst' as a value.
 tests/cases/compiler/typeofInternalModules.ts(17,9): error TS2709: Cannot use namespace 'Outer' as a type.
 tests/cases/compiler/typeofInternalModules.ts(19,1): error TS2322: Type 'typeof Outer' is not assignable to type 'typeof instantiated'.
-  Property 'C' is missing in type typeof Outer' but present in type 'typeof instantiated'.
+  Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
 tests/cases/compiler/typeofInternalModules.ts(21,16): error TS2708: Cannot use namespace 'importUninst' as a value.
 tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof instantiated' is not assignable to type 'typeof Outer'.
-  Property 'instantiated' is missing in type typeof instantiated' but present in type 'typeof Outer'.
+  Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
 
 
 ==== tests/cases/compiler/typeofInternalModules.ts (5 errors) ====
@@ -33,7 +33,7 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof
     x5 = Outer;
     ~~
 !!! error TS2322: Type 'typeof Outer' is not assignable to type 'typeof instantiated'.
-!!! error TS2322:   Property 'C' is missing in type typeof Outer' but present in type 'typeof instantiated'.
+!!! error TS2322:   Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
     x5 = Outer.instantiated;
     var x6: typeof importUninst;
                    ~~~~~~~~~~~~
@@ -42,5 +42,5 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof
     x7 = importInst;
     ~~
 !!! error TS2322: Type 'typeof instantiated' is not assignable to type 'typeof Outer'.
-!!! error TS2322:   Property 'instantiated' is missing in type typeof instantiated' but present in type 'typeof Outer'.
+!!! error TS2322:   Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
index 72ba1bd5abc58..b302857d698a7 100644
--- a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
+++ b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
@@ -37,9 +37,9 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(59,12): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(62,12): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(64,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'IterableIterator<number>'.
-  Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
+  Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(67,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterable<number>'.
-  Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
+  Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(70,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterator<number>'.
   Types of property 'next' are incompatible.
     Type '(value?: any) => Promise<IteratorResult<any>>' is not assignable to type '(value?: any) => IteratorResult<number>'.
@@ -173,13 +173,13 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
     async function * explicitReturnType10(): IterableIterator<number> {
                                              ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'IterableIterator<number>'.
-!!! error TS2322:   Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
+!!! error TS2322:   Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
         yield 1;
     }
     async function * explicitReturnType11(): Iterable<number> {
                                              ~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterable<number>'.
-!!! error TS2322:   Property '[Symbol.iterator]' is missing in type AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
+!!! error TS2322:   Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
         yield 1;
     }
     async function * explicitReturnType12(): Iterator<number> {
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
index 0cbe54b4f529b..f043250e4f02b 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
-  Property 'M2' is missing in type typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
+  Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
 
 
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeo
     var y: {M2: Object} = foo0;
         ~
 !!! error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
-!!! error TS2322:   Property 'M2' is missing in type typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
+!!! error TS2322:   Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
     
 ==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
     export interface Person {
diff --git a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
index f13cc542c2560..e7be977394654 100644
--- a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
+++ b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
@@ -1,15 +1,15 @@
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(25,1): error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
     Type 'Foo' is not assignable to type 'Bar'.
-      Property 'bar' is missing in type Foo' but present in type 'Bar'.
+      Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(26,1): error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
     Type 'Foo' is not assignable to type 'Baz'.
-      Property 'baz' is missing in type Foo' but present in type 'Baz'.
+      Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(27,1): error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
     Type 'Foo' is not assignable to type 'Kwah'.
-      Property 'kwah' is missing in type Foo' but present in type 'Kwah'.
+      Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(48,1): error TS2322: Type 'X<Foo>' is not assignable to type 'X<Bar> | Y<Baz> | Z<Kwah>'.
   Type 'X<Foo>' is not assignable to type 'X<Bar>'.
     Types of property 'xProp' are incompatible.
@@ -54,19 +54,19 @@ tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(50,1): error TS2322: Typ
 !!! error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
 !!! error TS2322:     Type 'Foo' is not assignable to type 'Bar'.
-!!! error TS2322:       Property 'bar' is missing in type Foo' but present in type 'Bar'.
+!!! error TS2322:       Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
     thingOfInterfaces = b;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
 !!! error TS2322:     Type 'Foo' is not assignable to type 'Baz'.
-!!! error TS2322:       Property 'baz' is missing in type Foo' but present in type 'Baz'.
+!!! error TS2322:       Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
     thingOfInterfaces = c;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
 !!! error TS2322:     Type 'Foo' is not assignable to type 'Kwah'.
-!!! error TS2322:       Property 'kwah' is missing in type Foo' but present in type 'Kwah'.
+!!! error TS2322:       Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
     
     ////////
     
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
index 2608183efb410..29ef071b92975 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
@@ -2,12 +2,12 @@ tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(19,1): error TS2
   Types of property 'parent' are incompatible.
     Type 'Module | Class' is not assignable to type 'Namespace'.
       Type 'Class' is not assignable to type 'Namespace'.
-        Property 'members' is missing in type Class' but present in type 'Namespace'.
+        Property 'members' is missing in type 'Class' but present in type 'Namespace'.
 tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2322: Type 'Class' is not assignable to type 'Property'.
   Types of property 'parent' are incompatible.
     Type 'Namespace' is not assignable to type 'Module | Class'.
       Type 'Namespace' is not assignable to type 'Class'.
-        Property 'parent' is missing in type Namespace' but present in type 'Class'.
+        Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
 
 
 ==== tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts (2 errors) ====
@@ -35,12 +35,12 @@ tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Module | Class' is not assignable to type 'Namespace'.
 !!! error TS2322:       Type 'Class' is not assignable to type 'Namespace'.
-!!! error TS2322:         Property 'members' is missing in type Class' but present in type 'Namespace'.
+!!! error TS2322:         Property 'members' is missing in type 'Class' but present in type 'Namespace'.
     p = c;
     ~
 !!! error TS2322: Type 'Class' is not assignable to type 'Property'.
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Namespace' is not assignable to type 'Module | Class'.
 !!! error TS2322:       Type 'Namespace' is not assignable to type 'Class'.
-!!! error TS2322:         Property 'parent' is missing in type Namespace' but present in type 'Class'.
+!!! error TS2322:         Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypesAssignability.errors.txt b/tests/baselines/reference/unionTypesAssignability.errors.txt
index 23b5a00b0c762..b8dac179d323c 100644
--- a/tests/baselines/reference/unionTypesAssignability.errors.txt
+++ b/tests/baselines/reference/unionTypesAssignability.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(18,1): error TS2322: Type 'E' is not assignable to type 'D'.
-  Property 'foo1' is missing in type E' but present in type 'D'.
+  Property 'foo1' is missing in type 'E' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(19,1): error TS2322: Type 'D | E' is not assignable to type 'D'.
   Type 'E' is not assignable to type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(20,1): error TS2322: Type 'D' is not assignable to type 'E'.
-  Property 'foo2' is missing in type D' but present in type 'E'.
+  Property 'foo2' is missing in type 'D' but present in type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(22,1): error TS2322: Type 'D | E' is not assignable to type 'E'.
   Type 'D' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(24,1): error TS2322: Type 'string' is not assignable to type 'number'.
@@ -13,9 +13,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(28,1): error TS2322: Type 'string | number' is not assignable to type 'string'.
   Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(31,1): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'foo1' is missing in type C' but present in type 'D'.
+  Property 'foo1' is missing in type 'C' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(32,1): error TS2322: Type 'C' is not assignable to type 'E'.
-  Property 'foo2' is missing in type C' but present in type 'E'.
+  Property 'foo2' is missing in type 'C' but present in type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(33,1): error TS2322: Type 'C' is not assignable to type 'D | E'.
   Type 'C' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(35,1): error TS2322: Type 'D' is not assignable to type 'E'.
@@ -51,7 +51,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = e;
     ~
 !!! error TS2322: Type 'E' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo1' is missing in type E' but present in type 'D'.
+!!! error TS2322:   Property 'foo1' is missing in type 'E' but present in type 'D'.
     d = unionDE; // error e is not assignable to d
     ~
 !!! error TS2322: Type 'D | E' is not assignable to type 'D'.
@@ -59,7 +59,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     e = d;
     ~
 !!! error TS2322: Type 'D' is not assignable to type 'E'.
-!!! error TS2322:   Property 'foo2' is missing in type D' but present in type 'E'.
+!!! error TS2322:   Property 'foo2' is missing in type 'D' but present in type 'E'.
     e = e;
     e = unionDE; // error d is not assignable to e
     ~
@@ -86,11 +86,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = c;
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo1' is missing in type C' but present in type 'D'.
+!!! error TS2322:   Property 'foo1' is missing in type 'C' but present in type 'D'.
     e = c;
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'E'.
-!!! error TS2322:   Property 'foo2' is missing in type C' but present in type 'E'.
+!!! error TS2322:   Property 'foo2' is missing in type 'C' but present in type 'E'.
     unionDE = c; // error since C is not assinable to either D or E
     ~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D | E'.

From f710d8dedc4be5f4083e8d7cee4ba28a48c5feca Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 1 Nov 2018 16:37:53 -0700
Subject: [PATCH 3/6] Fix jsx case

---
 src/compiler/checker.ts                       |  14 +-
 .../arityAndOrderCompatibility01.errors.txt   |  54 ++----
 .../reference/arrayAssignmentTest1.errors.txt | 114 ++++--------
 .../reference/arrayAssignmentTest2.errors.txt |  60 ++----
 .../reference/arrayAssignmentTest4.errors.txt |  12 +-
 .../reference/arrayAssignmentTest5.errors.txt |   6 +-
 .../baselines/reference/arrayFrom.errors.txt  |   6 +-
 .../reference/arrayLiterals3.errors.txt       |  18 +-
 ...typeIsAssignableToReadonlyArray.errors.txt |   6 +-
 ...signingFromObjectToAnythingElse.errors.txt |  16 +-
 .../reference/assignmentCompat1.errors.txt    |  12 +-
 ...nmentCompatBetweenTupleAndArray.errors.txt |   6 +-
 .../reference/assignmentCompatBug2.errors.txt |  18 +-
 ...gnmentCompatWithCallSignatures2.errors.txt |  48 ++---
 ...gnmentCompatWithCallSignatures3.errors.txt |  12 +-
 ...tCompatWithConstructSignatures2.errors.txt |  48 ++---
 ...tCompatWithConstructSignatures3.errors.txt |  12 +-
 ...ignmentCompatWithNumericIndexer.errors.txt |  12 +-
 ...gnmentCompatWithNumericIndexer2.errors.txt |  12 +-
 ...gnmentCompatWithNumericIndexer3.errors.txt |  12 +-
 ...ignmentCompatWithObjectMembers4.errors.txt |  18 +-
 ...ignmentCompatWithObjectMembers5.errors.txt |  12 +-
 ...atWithObjectMembersOptionality2.errors.txt |  54 ++----
 ...ObjectMembersStringNumericNames.errors.txt | 174 ++++++------------
 ...signmentCompatWithStringIndexer.errors.txt |  12 +-
 ...ignmentCompatWithStringIndexer2.errors.txt |  12 +-
 ...ember-off-of-function-interface.errors.txt |  12 +-
 ...ember-off-of-function-interface.errors.txt |  12 +-
 .../assignmentToObjectAndFunction.errors.txt  |   6 +-
 .../reference/chainedAssignment1.errors.txt   |  12 +-
 .../reference/chainedAssignment3.errors.txt   |   6 +-
 .../chainedAssignmentChecking.errors.txt      |  12 +-
 ...ConstrainedToOtherTypeParameter.errors.txt |   6 +-
 .../reference/checkJsdocTypeTag6.errors.txt   |   6 +-
 .../checkJsxChildrenProperty14.errors.txt     |  16 +-
 .../checkJsxChildrenProperty2.errors.txt      |  88 ++++-----
 .../checkJsxChildrenProperty5.errors.txt      |  40 ++--
 .../checkJsxChildrenProperty7.errors.txt      |  62 +++----
 .../classImplementsClass2.errors.txt          |   6 +-
 .../classImplementsClass4.errors.txt          |   6 +-
 ...onalOperatorWithoutIdenticalBCT.errors.txt |  12 +-
 ...atureInstatiationContravariance.errors.txt |   6 +-
 .../contextualTypeWithTuple.errors.txt        |  18 +-
 ...lTypeWithUnionTypeObjectLiteral.errors.txt |   6 +-
 .../reference/contextualTyping.errors.txt     |   6 +-
 .../reference/contextualTyping11.errors.txt   |   6 +-
 .../reference/contextualTyping5.errors.txt    |   6 +-
 .../reference/covariantCallbacks.errors.txt   |   6 +-
 ...ertyIsRelatableToTargetProperty.errors.txt |   6 +-
 .../declarationsAndAssignments.errors.txt     |   6 +-
 .../deeplyNestedAssignabilityIssue.errors.txt |  12 +-
 ...rayBindingPatternAndAssignment2.errors.txt |  12 +-
 ...tructuringParameterDeclaration2.errors.txt |   6 +-
 ...tructuringParameterDeclaration5.errors.txt |   6 +-
 ...orExpressionsWhichCouldBeCalled.errors.txt |  12 +-
 .../reference/elaboratedErrors.errors.txt     |  12 +-
 .../errorsWithInvokablesInUnions01.errors.txt |   6 +-
 ...AnnotationAndInvalidInitializer.errors.txt |  24 +--
 .../excessPropertyCheckWithUnions.errors.txt  |   6 +-
 ...fixingTypeParametersRepeatedly2.errors.txt |   6 +-
 tests/baselines/reference/for-of31.errors.txt |   6 +-
 .../reference/functionOverloads41.errors.txt  |   6 +-
 .../reference/generatorTypeCheck18.errors.txt |   6 +-
 .../reference/generatorTypeCheck20.errors.txt |   6 +-
 .../reference/generatorTypeCheck25.errors.txt |   6 +-
 .../reference/generatorTypeCheck7.errors.txt  |   6 +-
 ...thObjectTypeArgsAndConstraints3.errors.txt |   6 +-
 .../genericCallWithTupleType.errors.txt       |   6 +-
 .../genericRestParameters3.errors.txt         |   6 +-
 .../genericTypeAssertions2.errors.txt         |   6 +-
 ...tCallExpressionCheckReturntype1.errors.txt |   6 +-
 .../reference/incompatibleTypes.errors.txt    |   6 +-
 .../reference/inheritance1.errors.txt         |  60 ++----
 ...sxFactoryDeclarationsLocalTypes.errors.txt |  12 +-
 ...xFactoryLocalTypeGlobalFallback.errors.txt |   6 +-
 .../reference/intTypeCheck.errors.txt         |  46 ++---
 ...terfaceExtendsClassWithPrivate1.errors.txt |  18 +-
 .../reference/interfaceInheritance.errors.txt |   6 +-
 .../intersectionAndUnionTypes.errors.txt      |  66 +++----
 .../intersectionAsWeakTypeSource.errors.txt   |   6 +-
 .../intersectionTypeAssignment.errors.txt     |  24 +--
 .../invalidReturnStatements.errors.txt        |  12 +-
 .../iterableArrayPattern7.errors.txt          |   6 +-
 .../iteratorSpreadInArray9.errors.txt         |   6 +-
 .../jsContainerMergeTsDeclaration3.errors.txt |   6 +-
 .../reference/mappedTypes6.errors.txt         |  24 +--
 .../nonIterableRestElement3.errors.txt        |   6 +-
 .../nonPrimitiveAssignError.errors.txt        |   6 +-
 .../objectLiteralIndexerErrors.errors.txt     |   6 +-
 .../objectLiteralNormalization.errors.txt     |  18 +-
 .../reference/objectSpreadNegative.errors.txt |  12 +-
 .../optionalPropertiesTest.errors.txt         |  18 +-
 .../overloadingOnConstants1.errors.txt        |  24 +--
 .../overloadsWithProvisionalErrors.errors.txt |  12 +-
 .../promisesWithConstraints.errors.txt        |   6 +-
 tests/baselines/reference/qualify.errors.txt  |  24 +--
 .../recursiveIntersectionTypes.errors.txt     |   6 +-
 .../requireOfJsonFileInJsFile.errors.txt      |  12 +-
 ...cMemberOfAnotherClassAssignment.errors.txt |  24 +--
 .../strictFunctionTypesErrors.errors.txt      |   6 +-
 .../reference/strictTupleLength.errors.txt    |   6 +-
 ...ConstrainsPropertyDeclarations2.errors.txt |  12 +-
 .../reference/symbolProperty10.errors.txt     |   6 +-
 .../reference/symbolProperty52.errors.txt     |   6 +-
 .../reference/symbolProperty9.errors.txt      |   6 +-
 .../thisTypeInFunctionsNegative.errors.txt    |  24 +--
 .../tsxAttributeResolution1.errors.txt        |   6 +-
 .../tsxAttributeResolution12.errors.txt       |  12 +-
 .../tsxAttributeResolution3.errors.txt        |   6 +-
 .../tsxAttributeResolution5.errors.txt        |  12 +-
 .../tsxAttributeResolution6.errors.txt        |   6 +-
 .../tsxInvokeComponentType.errors.txt         |   8 +-
 .../tsxLibraryManagedAttributes.errors.txt    |  12 +-
 .../tsxNotUsingApparentTypeOfSFC.errors.txt   |  12 +-
 ...ponentWithDefaultTypeParameter3.errors.txt |   8 +-
 ...tsxSpreadAttributesResolution12.errors.txt |  14 +-
 ...tsxSpreadAttributesResolution16.errors.txt |   6 +-
 .../tsxSpreadAttributesResolution2.errors.txt |  14 +-
 .../tsxSpreadAttributesResolution6.errors.txt |   8 +-
 ...elessFunctionComponentOverload4.errors.txt |  16 +-
 ...tsxStatelessFunctionComponents1.errors.txt |   8 +-
 ...ionComponentsWithTypeArguments4.errors.txt |  14 +-
 .../reference/tsxUnionElementType6.errors.txt |  16 +-
 .../baselines/reference/tupleTypes.errors.txt |  12 +-
 .../typeGuardFunctionErrors.errors.txt        |   6 +-
 ...peGuardFunctionOfFormThisErrors.errors.txt |  12 +-
 .../baselines/reference/typeMatch1.errors.txt |   6 +-
 .../baselines/reference/typeMatch2.errors.txt |  24 +--
 ...gWithContextSensitiveArguments2.errors.txt |   6 +-
 ...gWithContextSensitiveArguments3.errors.txt |   6 +-
 .../reference/typeRelationships.errors.txt    |   6 +-
 .../typeofAmbientExternalModules.errors.txt   |  12 +-
 .../typeofExternalModules.errors.txt          |  12 +-
 .../typeofInternalModules.errors.txt          |  12 +-
 .../types.asyncGenerators.esnext.2.errors.txt |  18 +-
 ...yExternalModuleStillHasInstance.errors.txt |   6 +-
 ...unionTypeErrorMessageTypeRefs01.errors.txt |  18 +-
 ...eWithRecursiveSubtypeReduction2.errors.txt |  12 +-
 .../unionTypesAssignability.errors.txt        |  24 +--
 139 files changed, 752 insertions(+), 1478 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index efa911bf71d95..762a7f09b5043 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -428,6 +428,8 @@ namespace ts {
         const keyofConstraintType = keyofStringsOnly ? stringType : stringNumberSymbolType;
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        const emptyJsxObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        emptyJsxObjectType.objectFlags |= ObjectFlags.JsxAttributes;
 
         const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, InternalSymbolName.Type);
         emptyTypeLiteralSymbol.members = createSymbolTable();
@@ -11574,7 +11576,7 @@ namespace ts {
                     else if (source.symbol && source.flags & TypeFlags.Object && globalObjectType === source) {
                         reportError(Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
                     }
-                    else if (getObjectFlags(source) & ObjectFlags.JsxAttributes && target.flags & TypeFlags.Intersection) {
+                    else if (isComparingJsxAttributes && target.flags & TypeFlags.Intersection) {
                         const targetTypes = (target as IntersectionType).types;
                         const intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes, errorNode);
                         const intrinsicClassAttributes = getJsxType(JsxNames.IntrinsicClassAttributes, errorNode);
@@ -12216,8 +12218,8 @@ namespace ts {
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         const props = arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties));
-                        if (headMessage && headMessage.code !== Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
-                            headMessage.code !== Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code) {
+                        if (!headMessage || (headMessage.code !== Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
+                            headMessage.code !== Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
                             suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
@@ -17807,7 +17809,7 @@ namespace ts {
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement: JsxOpeningLikeElement, checkMode: CheckMode | undefined) {
             const attributes = openingLikeElement.attributes;
             let attributesTable = createSymbolTable();
-            let spread: Type = emptyObjectType;
+            let spread: Type = emptyJsxObjectType;
             let hasSpreadAnyType = false;
             let typeToIntersect: Type | undefined;
             let explicitlySpecifyChildrenAttribute = false;
@@ -17890,10 +17892,10 @@ namespace ts {
             if (hasSpreadAnyType) {
                 return anyType;
             }
-            if (typeToIntersect && spread !== emptyObjectType) {
+            if (typeToIntersect && spread !== emptyJsxObjectType) {
                 return getIntersectionType([typeToIntersect, spread]);
             }
-            return typeToIntersect || (spread === emptyObjectType ? createJsxAttributesType() : spread);
+            return typeToIntersect || (spread === emptyJsxObjectType ? createJsxAttributesType() : spread);
 
             /**
              * Create anonymous type from given attributes symbol table.
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
index b150c53c6d2f7..b394bab9d3bae 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
@@ -2,41 +2,32 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,12): erro
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,12): error TS2460: Type 'StrNum' has no property '2'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2461: Type '{ 0: string; 1: number; length: 2; }' is not an array type.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,12): error TS2460: Type '{ 0: string; 1: number; length: 2; }' has no property '2'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type '[string, number]' but present in type '[number, number, number]'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type 'StrNum' but present in type '[number, number, number]'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
-  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type '[string, number]' but present in type '[string, number, number]'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type 'StrNum' but present in type '[string, number, number]'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
-  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2737: Property '2' is missing in type '[string, number]' but present in type '[number, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2737: Property '2' is missing in type 'StrNum' but present in type '[number, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2737: Property '2' is missing in type '[string, number]' but present in type '[string, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2737: Property '2' is missing in type 'StrNum' but present in type '[string, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '[string, number]' is not assignable to type '[number]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error TS2322: Type 'StrNum' is not assignable to type '[number]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number]'.
-  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number]': pop, push, concat, join, and 15 more.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number]': pop, push, concat, join, and 15 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '[string, number]' is not assignable to type '[string]'.
   Types of property 'length' are incompatible.
     Type '2' is not assignable to type '1'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error TS2322: Type 'StrNum' is not assignable to type '[string]'.
   Types of property 'length' are incompatible.
     Type '2' is not assignable to type '1'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string]'.
-  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string]': pop, push, concat, join, and 15 more.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string]': pop, push, concat, join, and 15 more.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(31,5): error TS2322: Type 'StrNum' is not assignable to type '[number, string]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, string]'.
-  Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, string]': pop, push, concat, join, and 15 more.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, string]': pop, push, concat, join, and 15 more.
 
 
 ==== tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts (19 errors) ====
@@ -67,28 +58,22 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
 !!! error TS2460: Type '{ 0: string; 1: number; length: 2; }' has no property '2'.
     var j1: [number, number, number] = x;
         ~~
-!!! error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '[string, number]' but present in type '[number, number, number]'.
+!!! error TS2737: Property '2' is missing in type '[string, number]' but present in type '[number, number, number]'.
     var j2: [number, number, number] = y;
         ~~
-!!! error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type 'StrNum' but present in type '[number, number, number]'.
+!!! error TS2737: Property '2' is missing in type 'StrNum' but present in type '[number, number, number]'.
     var j3: [number, number, number] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
+!!! error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, number, number]': 2, pop, push, concat, and 16 more.
     var k1: [string, number, number] = x;
         ~~
-!!! error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '[string, number]' but present in type '[string, number, number]'.
+!!! error TS2737: Property '2' is missing in type '[string, number]' but present in type '[string, number, number]'.
     var k2: [string, number, number] = y;
         ~~
-!!! error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type 'StrNum' but present in type '[string, number, number]'.
+!!! error TS2737: Property '2' is missing in type 'StrNum' but present in type '[string, number, number]'.
     var k3: [string, number, number] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
+!!! error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string, number, number]': 2, pop, push, concat, and 16 more.
     var l1: [number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number]'.
@@ -101,8 +86,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var l3: [number] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number]'.
-!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number]': pop, push, concat, join, and 15 more.
     var m1: [string] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[string]'.
@@ -115,8 +99,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
 !!! error TS2322:     Type '2' is not assignable to type '1'.
     var m3: [string] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string]'.
-!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[string]': pop, push, concat, join, and 15 more.
     var n1: [number, string] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
@@ -128,8 +111,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var n3: [number, string] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, string]'.
-!!! error TS2322:   Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, string]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '{ 0: string; 1: number; length: 2; }' is missing the following properties from type '[number, string]': pop, push, concat, join, and 15 more.
     var o1: [string, number] = x;
     var o2: [string, number] = y;
     var o3: [string, number] = y;
diff --git a/tests/baselines/reference/arrayAssignmentTest1.errors.txt b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
index 2a018ae13d3b6..e09feebceeaff 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
@@ -1,50 +1,31 @@
-tests/cases/compiler/arrayAssignmentTest1.ts(46,5): error TS2322: Type 'undefined[]' is not assignable to type 'I1'.
-  Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
-tests/cases/compiler/arrayAssignmentTest1.ts(47,5): error TS2322: Type 'undefined[]' is not assignable to type 'C1'.
-  Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
-tests/cases/compiler/arrayAssignmentTest1.ts(48,5): error TS2322: Type 'undefined[]' is not assignable to type 'C2'.
-  Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
-tests/cases/compiler/arrayAssignmentTest1.ts(49,5): error TS2322: Type 'undefined[]' is not assignable to type 'C3'.
-  Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
+tests/cases/compiler/arrayAssignmentTest1.ts(46,5): error TS2737: Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
+tests/cases/compiler/arrayAssignmentTest1.ts(47,5): error TS2735: Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
+tests/cases/compiler/arrayAssignmentTest1.ts(48,5): error TS2735: Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
+tests/cases/compiler/arrayAssignmentTest1.ts(49,5): error TS2737: Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(60,1): error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
-  Type 'C3' is not assignable to type 'I1'.
-    Property 'IM1' is missing in type 'C3' but present in type 'I1'.
+  Property 'IM1' is missing in type 'C3' but present in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(64,1): error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
-  Type 'I1' is not assignable to type 'C1'.
-    Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
+  Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(65,1): error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
-  Type 'C3' is not assignable to type 'C1'.
-    Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
+  Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(68,1): error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
-  Type 'C1' is not assignable to type 'C2'.
-    Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
+  Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
 tests/cases/compiler/arrayAssignmentTest1.ts(69,1): error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
-  Type 'I1' is not assignable to type 'C2'.
-    Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
+  Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(70,1): error TS2322: Type 'C3[]' is not assignable to type 'C2[]'.
-  Type 'C3' is not assignable to type 'C2'.
-    Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
+  Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
 tests/cases/compiler/arrayAssignmentTest1.ts(75,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
-  Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
+  Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(76,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
-  Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
+  Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(77,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
-  Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
-tests/cases/compiler/arrayAssignmentTest1.ts(79,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-  Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
-tests/cases/compiler/arrayAssignmentTest1.ts(80,1): error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-  Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest1.ts(82,1): error TS2322: Type 'C1' is not assignable to type 'any[]'.
-  Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest1.ts(83,1): error TS2322: Type 'C2' is not assignable to type 'any[]'.
-  Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest1.ts(84,1): error TS2322: Type 'C3' is not assignable to type 'any[]'.
-  Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is not assignable to type 'any[]'.
-  Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+  Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
+tests/cases/compiler/arrayAssignmentTest1.ts(79,1): error TS2736: Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+tests/cases/compiler/arrayAssignmentTest1.ts(80,1): error TS2736: Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest1.ts(82,1): error TS2736: Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest1.ts(83,1): error TS2736: Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest1.ts(84,1): error TS2736: Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest1.ts (19 errors) ====
@@ -95,20 +76,16 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     
     var i1_error: I1 = []; // should be an error - is
         ~~~~~~~~
-!!! error TS2322: Type 'undefined[]' is not assignable to type 'I1'.
-!!! error TS2322:   Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
+!!! error TS2737: Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
     var c1_error: C1 = []; // should be an error - is
         ~~~~~~~~
-!!! error TS2322: Type 'undefined[]' is not assignable to type 'C1'.
-!!! error TS2322:   Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
+!!! error TS2735: Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
     var c2_error: C2 = []; // should be an error - is
         ~~~~~~~~
-!!! error TS2322: Type 'undefined[]' is not assignable to type 'C2'.
-!!! error TS2322:   Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
+!!! error TS2735: Type 'undefined[]' is missing the following properties from type 'C2': C2M1, IM1, C1M1
     var c3_error: C3 = []; // should be an error - is
         ~~~~~~~~
-!!! error TS2322: Type 'undefined[]' is not assignable to type 'C3'.
-!!! error TS2322:   Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
+!!! error TS2737: Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
     
     
     arr_any = arr_i1; // should be ok - is
@@ -122,38 +99,32 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     arr_i1 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
-!!! error TS2322:   Type 'C3' is not assignable to type 'I1'.
-!!! error TS2322:     Property 'IM1' is missing in type 'C3' but present in type 'I1'.
+!!! error TS2322:   Property 'IM1' is missing in type 'C3' but present in type 'I1'.
     
     arr_c1 = arr_c1; // should be ok - subtype relationship - is
     arr_c1 = arr_c2; // should be ok - subtype relationship - is
     arr_c1 = arr_i1; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
-!!! error TS2322:   Type 'I1' is not assignable to type 'C1'.
-!!! error TS2322:     Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
+!!! error TS2322:   Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
     arr_c1 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
-!!! error TS2322:   Type 'C3' is not assignable to type 'C1'.
-!!! error TS2322:     Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
+!!! error TS2322:   Type 'C3' is missing the following properties from type 'C1': IM1, C1M1
     
     arr_c2 = arr_c2; // should be ok - subtype relationship - is
     arr_c2 = arr_c1; // should be an error - subtype relationship - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
-!!! error TS2322:   Type 'C1' is not assignable to type 'C2'.
-!!! error TS2322:     Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
+!!! error TS2322:   Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
     arr_c2 = arr_i1; // should be an error - subtype relationship - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
-!!! error TS2322:   Type 'I1' is not assignable to type 'C2'.
-!!! error TS2322:     Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
+!!! error TS2322:   Type 'I1' is missing the following properties from type 'C2': C2M1, C1M1
     arr_c2 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'C2[]'.
-!!! error TS2322:   Type 'C3' is not assignable to type 'C2'.
-!!! error TS2322:     Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
+!!! error TS2322:   Type 'C3' is missing the following properties from type 'C2': C2M1, IM1, C1M1
     
     // "clean up bug" occurs at this point
     // if you move these three expressions to another file, they raise an error
@@ -161,41 +132,32 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     arr_c3 = arr_c2_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
-!!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
-!!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
-!!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = o1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-!!! error TS2322:   Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = a1; // should be ok - is
     arr_any = c1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c2; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C2' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c3; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C3' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = i1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'I1' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
\ No newline at end of file
+!!! error TS2736: Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest2.errors.txt b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
index 59dd4182e8592..6093b36b6da92 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
@@ -1,26 +1,16 @@
 tests/cases/compiler/arrayAssignmentTest2.ts(47,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
-  Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
+  Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(48,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
-  Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
+  Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest2.ts(49,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
-  Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
-tests/cases/compiler/arrayAssignmentTest2.ts(51,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-  Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
-tests/cases/compiler/arrayAssignmentTest2.ts(52,1): error TS2322: Type '() => any' is not assignable to type 'any[]'.
-  Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
-tests/cases/compiler/arrayAssignmentTest2.ts(53,1): error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-  Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest2.ts(55,1): error TS2322: Type 'C1' is not assignable to type 'any[]'.
-  Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest2.ts(56,1): error TS2322: Type 'C2' is not assignable to type 'any[]'.
-  Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest2.ts(57,1): error TS2322: Type 'C3' is not assignable to type 'any[]'.
-  Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
-tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2322: Type 'I1' is not assignable to type 'any[]'.
-  Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+  Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
+tests/cases/compiler/arrayAssignmentTest2.ts(51,1): error TS2736: Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+tests/cases/compiler/arrayAssignmentTest2.ts(52,1): error TS2736: Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+tests/cases/compiler/arrayAssignmentTest2.ts(53,1): error TS2736: Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest2.ts(55,1): error TS2736: Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest2.ts(56,1): error TS2736: Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest2.ts(57,1): error TS2736: Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2736: Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest2.ts (10 errors) ====
@@ -73,46 +63,36 @@ tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2322: Type 'I1' is n
     arr_c3 = arr_c2_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
-!!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
-!!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
-!!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2322:     Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
+!!! error TS2322:   Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type '() => C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '() => C1' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = function () { return null;} // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type '() => any' is not assignable to type 'any[]'.
-!!! error TS2322:   Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = o1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
-!!! error TS2322:   Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type '{ one: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = a1; // should be ok - is
     arr_any = c1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C1' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c2; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C2' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C2' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = c3; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C3' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     arr_any = i1; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'I1' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'I1' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest4.errors.txt b/tests/baselines/reference/arrayAssignmentTest4.errors.txt
index 2e9507c30d81b..b1cdd63b2ce13 100644
--- a/tests/baselines/reference/arrayAssignmentTest4.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest4.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/arrayAssignmentTest4.ts(22,1): error TS2322: Type '() => any' is not assignable to type 'any[]'.
-  Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
-tests/cases/compiler/arrayAssignmentTest4.ts(23,1): error TS2322: Type 'C3' is not assignable to type 'any[]'.
-  Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest4.ts(22,1): error TS2736: Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+tests/cases/compiler/arrayAssignmentTest4.ts(23,1): error TS2736: Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest4.ts (2 errors) ====
@@ -28,10 +26,8 @@ tests/cases/compiler/arrayAssignmentTest4.ts(23,1): error TS2322: Type 'C3' is n
     
     arr_any = function () { return null;} // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type '() => any' is not assignable to type 'any[]'.
-!!! error TS2322:   Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
+!!! error TS2736: Type '() => any' is missing the following properties from type 'any[]': pop, push, concat, join, and 15 more.
     arr_any = c3; // should be an error - is
     ~~~~~~~
-!!! error TS2322: Type 'C3' is not assignable to type 'any[]'.
-!!! error TS2322:   Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'C3' is missing the following properties from type 'any[]': length, pop, push, concat, and 16 more.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayAssignmentTest5.errors.txt b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
index a8a1bfc599565..75b515387ac76 100644
--- a/tests/baselines/reference/arrayAssignmentTest5.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
-  Type 'IToken' is not assignable to type 'IStateToken'.
-    Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
+  Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest5.ts (1 errors) ====
@@ -29,8 +28,7 @@ tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[
                 var tokens:IStateToken[]= lineTokens.tokens;
                     ~~~~~~
 !!! error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
-!!! error TS2322:   Type 'IToken' is not assignable to type 'IStateToken'.
-!!! error TS2322:     Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
+!!! error TS2322:   Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
                 if (tokens.length === 0) {
                     return this.onEnter(line, tokens, offset);        // <== this should produce an error since onEnter can not be called with (string, IStateToken[], offset)
                 }
diff --git a/tests/baselines/reference/arrayFrom.errors.txt b/tests/baselines/reference/arrayFrom.errors.txt
index 34acb5b63177c..0325f5ad74aec 100644
--- a/tests/baselines/reference/arrayFrom.errors.txt
+++ b/tests/baselines/reference/arrayFrom.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/compiler/arrayFrom.ts(20,7): error TS2322: Type 'A[]' is not assignable to type 'B[]'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A' but present in type 'B'.
+  Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assignable to type 'B[]'.
 
 
@@ -27,8 +26,7 @@ tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assigna
     const result3: B[] = Array.from(inputA.values()); // expect error
           ~~~~~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
-!!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
     const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
     const result5: A[] = Array.from(inputALike);
     const result6: B[] = Array.from(inputALike); // expect error
diff --git a/tests/baselines/reference/arrayLiterals3.errors.txt b/tests/baselines/reference/arrayLiterals3.errors.txt
index dd4d79d510186..259dbdbe51e7f 100644
--- a/tests/baselines/reference/arrayLiterals3.errors.txt
+++ b/tests/baselines/reference/arrayLiterals3.errors.txt
@@ -1,15 +1,12 @@
-tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(10,5): error TS2322: Type '[]' is not assignable to type '[any, any, any]'.
-  Type '[]' is missing the following properties from type '[any, any, any]': 0, 1, 2
+tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(10,5): error TS2735: Type '[]' is missing the following properties from type '[any, any, any]': 0, 1, 2
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,38): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,48): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,51): error TS2322: Type 'true' is not assignable to type 'number'.
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(17,5): error TS2322: Type '[number, number, string, boolean]' is not assignable to type '[number, number]'.
   Types of property 'length' are incompatible.
     Type '4' is not assignable to type '2'.
-tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(32,5): error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
-  Type '(number[] | string[])[]' is missing the following properties from type 'tup': 0, 1
-tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(33,5): error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
-  Type 'number[]' is missing the following properties from type '[number, number, number]': 0, 1, 2
+tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(32,5): error TS2735: Type '(number[] | string[])[]' is missing the following properties from type 'tup': 0, 1
+tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(33,5): error TS2735: Type 'number[]' is missing the following properties from type '[number, number, number]': 0, 1, 2
 tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
   Types of property 'pop' are incompatible.
     Type '() => string | number' is not assignable to type '() => Number'.
@@ -29,8 +26,7 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
     
     var a0: [any, any, any] = [];                             // Error
         ~~
-!!! error TS2322: Type '[]' is not assignable to type '[any, any, any]'.
-!!! error TS2322:   Type '[]' is missing the following properties from type '[any, any, any]': 0, 1, 2
+!!! error TS2735: Type '[]' is missing the following properties from type '[any, any, any]': 0, 1, 2
     var a1: [boolean, string, number] = ["string", 1, true];  // Error
                                          ~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'boolean'.
@@ -64,12 +60,10 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
     interface myArray2 extends Array<Number|String> { }
     var c0: tup = [...temp2];                         // Error
         ~~
-!!! error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
-!!! error TS2322:   Type '(number[] | string[])[]' is missing the following properties from type 'tup': 0, 1
+!!! error TS2735: Type '(number[] | string[])[]' is missing the following properties from type 'tup': 0, 1
     var c1: [number, number, number] = [...temp1];    // Error cannot assign number[] to [number, number, number]
         ~~
-!!! error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Type 'number[]' is missing the following properties from type '[number, number, number]': 0, 1, 2
+!!! error TS2735: Type 'number[]' is missing the following properties from type '[number, number, number]': 0, 1, 2
     var c2: myArray = [...temp1, ...temp];            // Error cannot assign (number|string)[] to number[]
         ~~
 !!! error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
diff --git a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
index 14c425977592e..e38b35538fb29 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(13,1): error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A' but present in type 'B'.
+  Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error TS2322: Type 'C<A>' is not assignable to type 'ReadonlyArray<B>'.
   Types of property 'concat' are incompatible.
     Type '{ (...items: ConcatArray<A>[]): A[]; (...items: (A | ConcatArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ConcatArray<B>[]): B[]; (...items: (B | ConcatArray<B>)[]): B[]; }'.
@@ -24,8 +23,7 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
     rrb = ara; // error: 'A' is not assignable to 'B'
     ~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
-!!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
     
     rra = cra;
     rra = crb; // OK, C<B> is assignable to ReadonlyArray<A>
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
index 138b0608e5e6d..e098edbf80e5d 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2322: Type 'Object' is not assignable to type 'RegExp'.
-  The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
+tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2736: Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,31): error TS2558: Expected 0 type arguments, but got 1.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,31): error TS2558: Expected 0 type arguments, but got 1.
-tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Type 'Object' is not assignable to type 'Error'.
-  The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Type 'Object' is missing the following properties from type 'Error': name, message
+tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2735: Type 'Object' is missing the following properties from type 'Error': name, message
 
 
 ==== tests/cases/compiler/assigningFromObjectToAnythingElse.ts (4 errors) ====
@@ -13,9 +9,7 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Ty
     var y: RegExp;
     y = x;
     ~
-!!! error TS2322: Type 'Object' is not assignable to type 'RegExp'.
-!!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
+!!! error TS2736: Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
     
     var a: String = Object.create<Object>("");
                                   ~~~~~~
@@ -26,7 +20,5 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Ty
     
     var w: Error = new Object();
         ~
-!!! error TS2322: Type 'Object' is not assignable to type 'Error'.
-!!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Type 'Object' is missing the following properties from type 'Error': name, message
+!!! error TS2735: Type 'Object' is missing the following properties from type 'Error': name, message
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompat1.errors.txt b/tests/baselines/reference/assignmentCompat1.errors.txt
index d507b8bfdec11..aafaadf62770a 100644
--- a/tests/baselines/reference/assignmentCompat1.errors.txt
+++ b/tests/baselines/reference/assignmentCompat1.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/assignmentCompat1.ts(4,1): error TS2322: Type '{ [index: string]: any; }' is not assignable to type '{ one: number; }'.
-  Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
-tests/cases/compiler/assignmentCompat1.ts(6,1): error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
-  Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
+tests/cases/compiler/assignmentCompat1.ts(4,1): error TS2737: Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
+tests/cases/compiler/assignmentCompat1.ts(6,1): error TS2737: Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
 tests/cases/compiler/assignmentCompat1.ts(8,1): error TS2322: Type '"foo"' is not assignable to type '{ [index: string]: any; }'.
 tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is not assignable to type '{ [index: number]: any; }'.
 
@@ -12,13 +10,11 @@ tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is n
     var z: { [index: number]: any };
     x = y;  // Error
     ~
-!!! error TS2322: Type '{ [index: string]: any; }' is not assignable to type '{ one: number; }'.
-!!! error TS2322:   Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
+!!! error TS2737: Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
     y = x;  // Ok because index signature type is any
     x = z;  // Error
     ~
-!!! error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
-!!! error TS2322:   Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
+!!! error TS2737: Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
     z = x;  // Ok because index signature type is any
     y = "foo"; // Error
     ~
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
index d698826ca1e5a..16e290f30e6cb 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(17,1): error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
   Type 'string | number' is not assignable to type 'number'.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2322: Type '{}[]' is not assignable to type '[{}]'.
-  Property '0' is missing in type '{}[]' but present in type '[{}]'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2737: Property '0' is missing in type '{}[]' but present in type '[{}]'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts (2 errors) ====
@@ -29,6 +28,5 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     emptyObjTuple = emptyObjArray;
     ~~~~~~~~~~~~~
-!!! error TS2322: Type '{}[]' is not assignable to type '[{}]'.
-!!! error TS2322:   Property '0' is missing in type '{}[]' but present in type '[{}]'.
+!!! error TS2737: Property '0' is missing in type '{}[]' but present in type '[{}]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatBug2.errors.txt b/tests/baselines/reference/assignmentCompatBug2.errors.txt
index 6f520fb39e9c7..ffd1b244a0cc9 100644
--- a/tests/baselines/reference/assignmentCompatBug2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBug2.errors.txt
@@ -4,12 +4,9 @@ tests/cases/compiler/assignmentCompatBug2.ts(3,8): error TS2322: Type '{ a: numb
   Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
 tests/cases/compiler/assignmentCompatBug2.ts(5,13): error TS2322: Type '{ b: number; a: number; }' is not assignable to type '{ b: number; }'.
   Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
-tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-  Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2737: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2737: Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2737: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
 
 
 ==== tests/cases/compiler/assignmentCompatBug2.ts (6 errors) ====
@@ -38,16 +35,14 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     
     b3 = {
     ~~
-!!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! error TS2737: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
     }; // error
     
     b3 = {
     ~~
-!!! error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! error TS2737: Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         m: 0,
     }; // error
@@ -62,8 +57,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
     
     b3 = {
     ~~
-!!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
-!!! error TS2322:   Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! error TS2737: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
         n: 0,
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
index 20a74544b8b6e..a87f2a17a0df4 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(31,1): error TS2322: Type '() => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '() => number' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(32,1): error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(33,1): error TS2322: Type '() => number' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(34,1): error TS2322: Type '(x: number) => string' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(31,1): error TS2737: Property 'f' is missing in type '() => number' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(32,1): error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(33,1): error TS2737: Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(34,1): error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(42,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
@@ -16,10 +12,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(44,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(45,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(44,1): error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(45,1): error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(46,1): error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
@@ -30,10 +24,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(48,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
-  Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(48,1): error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(49,1): error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts (12 errors) ====
@@ -69,20 +61,16 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     // errors
     t = () => 1;
     ~
-!!! error TS2322: Type '() => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '() => number' but present in type 'T'.
     t = function (x: number) { return ''; }
     ~
-!!! error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
     a = () => 1;
     ~
-!!! error TS2322: Type '() => number' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
+!!! error TS2737: Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
     a = function (x: number) { return ''; }
     ~
-!!! error TS2322: Type '(x: number) => string' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
+!!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
     
     interface S2 {
         f(x: string): void;
@@ -106,12 +94,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:         Type 'number' is not assignable to type 'string'.
     t = (x: string) => 1;
     ~
-!!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
     t = function (x: string) { return ''; }
     ~
-!!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
@@ -128,10 +114,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:         Type 'number' is not assignable to type 'string'.
     a = (x: string) => 1;
     ~
-!!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
     a = function (x: string) { return ''; }
     ~
-!!! error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
index 994d1041803ea..157c60739fda2 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
@@ -35,14 +35,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(77,1): error TS2322: Type '(x: { foo: string; }, y: { foo: string; bar: string; }) => Base' is not assignable to type '<T extends Base>(x: T, y: T) => T'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
-      Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-        Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
+      Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(80,1): error TS2322: Type '(x: Base[], y: Derived2[]) => Derived[]' is not assignable to type '<T extends Base[]>(x: Base[], y: T) => Derived[]'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type 'Derived2[]'.
       Type 'Base[]' is not assignable to type 'Derived2[]'.
-        Type 'Base' is not assignable to type 'Derived2'.
-          Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+        Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(83,1): error TS2322: Type '(x: Base[], y: Derived[]) => Derived[]' is not assignable to type '<T extends Derived[]>(x: Base[], y: T) => T'.
   Type 'Derived[]' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts(85,1): error TS2322: Type '<T>(x: { a: T; b: T; }) => T' is not assignable to type '(x: { a: string; b: number; }) => Object'.
@@ -183,8 +181,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '(x: { foo: string; }, y: { foo: string; bar: string; }) => Base' is not assignable to type '<T extends Base>(x: T, y: T) => T'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:         Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
     var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
@@ -193,8 +190,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2[]'.
 !!! error TS2322:       Type 'Base[]' is not assignable to type 'Derived2[]'.
-!!! error TS2322:         Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:           Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+!!! error TS2322:         Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
     a13 = b13; // ok
     b13 = a13; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
index 4d2853a6505e8..5280675fb9bea 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(23,1): error TS2322: Type '() => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '() => number' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(24,1): error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(25,1): error TS2322: Type '() => number' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(26,1): error TS2322: Type '(x: number) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(23,1): error TS2737: Property 'f' is missing in type '() => number' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(24,1): error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(25,1): error TS2737: Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(26,1): error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(34,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
@@ -14,10 +10,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(36,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(37,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-  Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(36,1): error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(37,1): error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(38,1): error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
@@ -26,10 +20,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type 'new (x: number) => void'.
       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(40,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(41,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-  Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(40,1): error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts(41,1): error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts (12 errors) ====
@@ -57,20 +49,16 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     // errors
     t = () => 1;
     ~
-!!! error TS2322: Type '() => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '() => number' but present in type 'T'.
     t = function (x: number) { return ''; }
     ~
-!!! error TS2322: Type '(x: number) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
     a = () => 1;
     ~
-!!! error TS2322: Type '() => number' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2737: Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
     a = function (x: number) { return ''; }
     ~
-!!! error TS2322: Type '(x: number) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
     
     interface S2 {
         f(x: string): void;
@@ -92,12 +80,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
     t = (x: string) => 1;
     ~
-!!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
     t = function (x: string) { return ''; }
     ~
-!!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
@@ -112,10 +98,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:       Type '(x: string) => void' provides no match for the signature 'new (x: number): void'.
     a = (x: string) => 1;
     ~
-!!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
     a = function (x: string) { return ''; }
     ~
-!!! error TS2322: Type '(x: string) => string' is not assignable to type '{ f: new (x: number) => void; }'.
-!!! error TS2322:   Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
+!!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
index f6248d05071c3..740bce752d71b 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
@@ -35,14 +35,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(77,1): error TS2322: Type 'new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base' is not assignable to type 'new <T extends Base>(x: T, y: T) => T'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
-      Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-        Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
+      Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(80,1): error TS2322: Type 'new (x: Base[], y: Derived2[]) => Derived[]' is not assignable to type 'new <T extends Base[]>(x: Base[], y: T) => Derived[]'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'T' is not assignable to type 'Derived2[]'.
       Type 'Base[]' is not assignable to type 'Derived2[]'.
-        Type 'Base' is not assignable to type 'Derived2'.
-          Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+        Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(83,1): error TS2322: Type 'new (x: Base[], y: Derived[]) => Derived[]' is not assignable to type 'new <T extends Derived[]>(x: Base[], y: T) => T'.
   Type 'Derived[]' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts(85,1): error TS2322: Type 'new <T>(x: { a: T; b: T; }) => T' is not assignable to type 'new (x: { a: string; b: number; }) => Object'.
@@ -183,8 +181,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base' is not assignable to type 'new <T extends Base>(x: T, y: T) => T'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:       Type 'Base' is not assignable to type '{ foo: string; bar: string; }'.
-!!! error TS2322:         Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
+!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
     var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
@@ -193,8 +190,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2[]'.
 !!! error TS2322:       Type 'Base[]' is not assignable to type 'Derived2[]'.
-!!! error TS2322:         Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:           Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+!!! error TS2322:         Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
     a13 = b13; // ok
     b13 = a13; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
index 5094c1c1584ae..9fbf4035d3add 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(14,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(18,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived2'.
-      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+    Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(32,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -40,8 +38,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
@@ -49,8 +46,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+!!! error TS2322:     Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         class A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
index c4c0cf984cd39..a09544b3c37c8 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(14,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(18,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived2'.
-      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+    Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(32,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -40,8 +38,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
@@ -49,8 +46,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+!!! error TS2322:     Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         interface A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
index 87e030364787c..e71a7a5b8600e 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(14,1): error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(23,1): error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
-    Type 'Derived' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
+    Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived' is not assignable to type 'T'.
@@ -29,8 +27,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~
 !!! error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     b = a; // ok
     
     class B2 extends A {
@@ -43,8 +40,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Derived' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
+!!! error TS2322:     Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
     
     module Generics {
         class A<T extends Derived> {
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
index 9437f318bf5f9..63b85c66c9b4d 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(24,5): error TS2322: Type 'T' is not assignable to type 'S'.
   Types of property 'foo' are incompatible.
-    Type 'Derived2' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(25,5): error TS2322: Type 'S' is not assignable to type 'T'.
   Types of property 'foo' are incompatible.
-    Type 'Derived' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
+    Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(29,5): error TS2322: Type 'T2' is not assignable to type 'S2'.
   Types of property 'foo' are incompatible.
     Type 'Derived2' is not assignable to type 'Derived'.
@@ -41,8 +39,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     Type 'Derived2' is not assignable to type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(70,5): error TS2322: Type 'S' is not assignable to type 'T'.
   Types of property 'foo' are incompatible.
-    Type 'Base' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
+    Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts(75,5): error TS2322: Type 'S2' is not assignable to type 'T2'.
   Types of property 'foo' are incompatible.
     Type 'Base' is not assignable to type 'Derived2'.
@@ -82,14 +79,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~
 !!! error TS2322: Type 'T' is not assignable to type 'S'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
-!!! error TS2322:     Type 'Derived2' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
+!!! error TS2322:     Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
         t = s; // error
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
-!!! error TS2322:     Type 'Derived' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
+!!! error TS2322:     Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
         s = s2; // ok
         s = a2; // ok
     
@@ -182,8 +177,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
+!!! error TS2322:     Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
         s = s2; // ok
         s = a2; // ok
     
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
index ae1a049d1941d..fe4cce9b929f3 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(13,1): error TS2322: Type 'I' is not assignable to type 'C'.
-  Property 'foo' is missing in type 'I' but present in type 'C'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(14,1): error TS2322: Type 'C' is not assignable to type 'I'.
-  Property 'fooo' is missing in type 'C' but present in type 'I'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(13,1): error TS2737: Property 'foo' is missing in type 'I' but present in type 'C'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts(14,1): error TS2737: Property 'fooo' is missing in type 'C' but present in type 'I'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts (2 errors) ====
@@ -19,9 +17,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     
     c = i; // error
     ~
-!!! error TS2322: Type 'I' is not assignable to type 'C'.
-!!! error TS2322:   Property 'foo' is missing in type 'I' but present in type 'C'.
+!!! error TS2737: Property 'foo' is missing in type 'I' but present in type 'C'.
     i = c; // error
     ~
-!!! error TS2322: Type 'C' is not assignable to type 'I'.
-!!! error TS2322:   Property 'fooo' is missing in type 'C' but present in type 'I'.
\ No newline at end of file
+!!! error TS2737: Property 'fooo' is missing in type 'C' but present in type 'I'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
index fc3cc1c7f1ce6..a7398540b050f 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
@@ -7,24 +7,15 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(39,5): error TS2559: Type 'D' has no properties in common with type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2559: Type 'E' has no properties in common with type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(41,5): error TS2559: Type 'F' has no properties in common with type '{ opt?: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(74,5): error TS2322: Type 'D' is not assignable to type 'C'.
-  Property 'opt' is missing in type 'D' but present in type 'C'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(75,5): error TS2322: Type 'E' is not assignable to type 'C'.
-  Property 'opt' is missing in type 'E' but present in type 'C'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(76,5): error TS2322: Type 'F' is not assignable to type 'C'.
-  Property 'opt' is missing in type 'F' but present in type 'C'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(79,5): error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(80,5): error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(81,5): error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(84,5): error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(85,5): error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-  Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(74,5): error TS2737: Property 'opt' is missing in type 'D' but present in type 'C'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(75,5): error TS2737: Property 'opt' is missing in type 'E' but present in type 'C'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(76,5): error TS2737: Property 'opt' is missing in type 'F' but present in type 'C'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(79,5): error TS2737: Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(80,5): error TS2737: Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(81,5): error TS2737: Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(84,5): error TS2737: Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(85,5): error TS2737: Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2737: Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts (18 errors) ====
@@ -121,44 +112,35 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     
         c = d; // error
         ~
-!!! error TS2322: Type 'D' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type 'D' but present in type 'C'.
+!!! error TS2737: Property 'opt' is missing in type 'D' but present in type 'C'.
         c = e; // error
         ~
-!!! error TS2322: Type 'E' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type 'E' but present in type 'C'.
+!!! error TS2737: Property 'opt' is missing in type 'E' but present in type 'C'.
         c = f; // error
         ~
-!!! error TS2322: Type 'F' is not assignable to type 'C'.
-!!! error TS2322:   Property 'opt' is missing in type 'F' but present in type 'C'.
+!!! error TS2737: Property 'opt' is missing in type 'F' but present in type 'C'.
         c = a; // ok
     
         a = d; // error
         ~
-!!! error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
+!!! error TS2737: Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
         a = e; // error
         ~
-!!! error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
+!!! error TS2737: Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
         a = f; // error
         ~
-!!! error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
+!!! error TS2737: Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
         a = c; // ok
     
         b = d; // error
         ~
-!!! error TS2322: Type 'D' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
+!!! error TS2737: Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
         b = e; // error
         ~
-!!! error TS2322: Type 'E' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
+!!! error TS2737: Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
         b = f; // error
         ~
-!!! error TS2322: Type 'F' is not assignable to type '{ opt: Base; }'.
-!!! error TS2322:   Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
+!!! error TS2737: Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
         b = a; // ok
         b = c; // ok
     }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
index 81ea7ef45ea9c..d9323121cdc8e 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
@@ -1,61 +1,32 @@
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(21,5): error TS2322: Type 'T' is not assignable to type 'S'.
-  Property ''1'' is missing in type 'T' but present in type 'S'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(22,5): error TS2322: Type 'S' is not assignable to type 'T'.
-  Property ''1.'' is missing in type 'S' but present in type 'T'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(24,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(26,5): error TS2322: Type 'T2' is not assignable to type 'S2'.
-  Property ''1'' is missing in type 'T2' but present in type 'S2'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(27,5): error TS2322: Type 'S2' is not assignable to type 'T2'.
-  Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(28,5): error TS2322: Type 'T' is not assignable to type 'S2'.
-  Property ''1'' is missing in type 'T' but present in type 'S2'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(29,5): error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(30,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(32,5): error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(33,5): error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ '1.0': string; baz?: string; }'.
-  Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(34,5): error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(35,5): error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(36,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(38,5): error TS2322: Type '{ '1': string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(39,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1': string; }'.
-  Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(42,5): error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(65,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(71,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-  Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(73,5): error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(74,5): error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ 1.0: string; baz?: string; }'.
-  Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(75,5): error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(76,5): error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(77,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(78,5): error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-  Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(80,5): error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(81,5): error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ 1.: string; }'.
-  Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(82,5): error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(83,5): error TS2322: Type 'T2' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-  Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(21,5): error TS2737: Property ''1'' is missing in type 'T' but present in type 'S'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(22,5): error TS2737: Property ''1.'' is missing in type 'S' but present in type 'T'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(24,5): error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(26,5): error TS2737: Property ''1'' is missing in type 'T2' but present in type 'S2'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(27,5): error TS2737: Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(28,5): error TS2737: Property ''1'' is missing in type 'T' but present in type 'S2'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(29,5): error TS2737: Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(30,5): error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(32,5): error TS2737: Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(33,5): error TS2737: Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(34,5): error TS2737: Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(35,5): error TS2737: Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(36,5): error TS2737: Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(38,5): error TS2737: Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(39,5): error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(42,5): error TS2737: Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(65,5): error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(71,5): error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(73,5): error TS2737: Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(74,5): error TS2737: Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(75,5): error TS2737: Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(76,5): error TS2737: Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(77,5): error TS2737: Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(78,5): error TS2737: Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(80,5): error TS2737: Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(81,5): error TS2737: Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(82,5): error TS2737: Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(83,5): error TS2737: Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2737: Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts (29 errors) ====
@@ -81,74 +52,58 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     
         s = t;
         ~
-!!! error TS2322: Type 'T' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type 'T' but present in type 'S'.
+!!! error TS2737: Property ''1'' is missing in type 'T' but present in type 'S'.
         t = s;
         ~
-!!! error TS2322: Type 'S' is not assignable to type 'T'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S' but present in type 'T'.
+!!! error TS2737: Property ''1.'' is missing in type 'S' but present in type 'T'.
         s = s2; // ok
         s = a2;
         ~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
+!!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
     
         s2 = t2;
         ~~
-!!! error TS2322: Type 'T2' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type 'T2' but present in type 'S2'.
+!!! error TS2737: Property ''1'' is missing in type 'T2' but present in type 'S2'.
         t2 = s2;
         ~~
-!!! error TS2322: Type 'S2' is not assignable to type 'T2'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
+!!! error TS2737: Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
         s2 = t;
         ~~
-!!! error TS2322: Type 'T' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type 'T' but present in type 'S2'.
+!!! error TS2737: Property ''1'' is missing in type 'T' but present in type 'S2'.
         s2 = b;
         ~~
-!!! error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
+!!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
         s2 = a2;
         ~~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
+!!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
     
         a = b;
         ~
-!!! error TS2322: Type '{ '1.0': string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
         b = a;
         ~
-!!! error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ '1.0': string; baz?: string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
         a = s;
         ~
-!!! error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
         a = s2;
         ~
-!!! error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
         a = a2;
         ~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
     
         a2 = b2;
         ~~
-!!! error TS2322: Type '{ '1': string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
         b2 = a2;
         ~~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1': string; }'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
+!!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
         a2 = b; // ok
         a2 = t2; // ok
         a2 = t;
         ~~
-!!! error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
     }
     
     module NumbersAndStrings {
@@ -173,8 +128,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = s2; // ok
         s = a2; // error
         ~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
+!!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
     
         s2 = t2; // ok
         t2 = s2; // ok
@@ -182,52 +136,40 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s2 = b; // ok
         s2 = a2; // error
         ~~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type 'S2'.
-!!! error TS2322:   Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
+!!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
     
         a = b; // error
         ~
-!!! error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
         b = a; // error
         ~
-!!! error TS2322: Type '{ '1.': string; bar?: string; }' is not assignable to type '{ 1.0: string; baz?: string; }'.
-!!! error TS2322:   Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
+!!! error TS2737: Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
         a = s; // error
         ~
-!!! error TS2322: Type 'S' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
         a = s2; // error
         ~
-!!! error TS2322: Type 'S2' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
         a = a2; // error
         ~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
         a = b2; // error
         ~
-!!! error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.': string; bar?: string; }'.
-!!! error TS2322:   Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! error TS2737: Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
     
         a2 = b2; // error
         ~~
-!!! error TS2322: Type '{ 1.: string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
         b2 = a2; // error
         ~~
-!!! error TS2322: Type '{ '1.0': string; }' is not assignable to type '{ 1.: string; }'.
-!!! error TS2322:   Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
+!!! error TS2737: Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
         a2 = b; // error
         ~~
-!!! error TS2322: Type '{ 1.0: string; baz?: string; }' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
         a2 = t2; // error
         ~~
-!!! error TS2322: Type 'T2' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
         a2 = t; // error
         ~~
-!!! error TS2322: Type 'T' is not assignable to type '{ '1.0': string; }'.
-!!! error TS2322:   Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
+!!! error TS2737: Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
index 931aca5bfaf64..992e29a0bd1f1 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(15,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(19,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived2'.
-      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+    Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts(33,5): error TS2322: Type 'A<Base>' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
@@ -47,8 +45,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
@@ -56,8 +53,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+!!! error TS2322:     Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         class A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
index 2b1840093c27a..f1971814b20d6 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(15,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+    Property 'bar' is missing in type 'Base' but present in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(19,1): error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
   Index signatures are incompatible.
-    Type 'Base' is not assignable to type 'Derived2'.
-      Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+    Type 'Base' is missing the following properties from type 'Derived2': baz, bar
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts(33,5): error TS2322: Type 'A<Base>' is not assignable to type '{ [x: string]: Derived; }'.
   Index signatures are incompatible.
     Type 'Base' is not assignable to type 'Derived'.
@@ -47,8 +45,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
@@ -56,8 +53,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~~
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'Base' is not assignable to type 'Derived2'.
-!!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
+!!! error TS2322:     Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
     module Generics {
         interface A<T extends Base> {
diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
index df088bcc028e5..97a4ae9805bd2 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
@@ -1,9 +1,7 @@
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(10,1): error TS2322: Type '""' is not assignable to type 'Applicable'.
-tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
+tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(11,1): error TS2737: Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(12,1): error TS2322: Type '4' is not assignable to type 'Applicable'.
-tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type '{}' but present in type 'Applicable'.
+tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(13,1): error TS2737: Property 'apply' is missing in type '{}' but present in type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
@@ -25,15 +23,13 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
 !!! error TS2322: Type '""' is not assignable to type 'Applicable'.
     x = [''];
     ~
-!!! error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
+!!! error TS2737: Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Applicable'.
     x = {};
     ~
-!!! error TS2322: Type '{}' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type '{}' but present in type 'Applicable'.
+!!! error TS2737: Property 'apply' is missing in type '{}' but present in type 'Applicable'.
     
     // Should work
     function f() { };
diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
index 6c481156bd97b..97d74cf93ba8a 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
@@ -1,9 +1,7 @@
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(10,1): error TS2322: Type '""' is not assignable to type 'Callable'.
-tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Callable'.
-  Property 'call' is missing in type 'string[]' but present in type 'Callable'.
+tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(11,1): error TS2737: Property 'call' is missing in type 'string[]' but present in type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(12,1): error TS2322: Type '4' is not assignable to type 'Callable'.
-tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Callable'.
-  Property 'call' is missing in type '{}' but present in type 'Callable'.
+tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(13,1): error TS2737: Property 'call' is missing in type '{}' but present in type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
@@ -25,15 +23,13 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
 !!! error TS2322: Type '""' is not assignable to type 'Callable'.
     x = [''];
     ~
-!!! error TS2322: Type 'string[]' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type 'string[]' but present in type 'Callable'.
+!!! error TS2737: Property 'call' is missing in type 'string[]' but present in type 'Callable'.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Callable'.
     x = {};
     ~
-!!! error TS2322: Type '{}' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type '{}' but present in type 'Callable'.
+!!! error TS2737: Property 'call' is missing in type '{}' but present in type 'Callable'.
     
     // Should work
     function f() { };
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
index 31ea9c7116069..9c5fc68280691 100644
--- a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
+++ b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/compiler/assignmentToObjectAndFunction.ts(1,24): error TS2322: Type 'number' is not assignable to type '() => string'.
-tests/cases/compiler/assignmentToObjectAndFunction.ts(8,5): error TS2322: Type '{}' is not assignable to type 'Function'.
-  Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
+tests/cases/compiler/assignmentToObjectAndFunction.ts(8,5): error TS2736: Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
 tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type 'typeof bad' is not assignable to type 'Function'.
   Types of property 'apply' are incompatible.
     Type 'number' is not assignable to type '(this: Function, thisArg: any, argArray?: any) => any'.
@@ -18,8 +17,7 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type
     
     var errFun: Function = {}; // Error for no call signature
         ~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'Function'.
-!!! error TS2322:   Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
+!!! error TS2736: Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
     
     function foo() { }
     module foo {
diff --git a/tests/baselines/reference/chainedAssignment1.errors.txt b/tests/baselines/reference/chainedAssignment1.errors.txt
index 13c77d7ca41ad..87c051b51f2e6 100644
--- a/tests/baselines/reference/chainedAssignment1.errors.txt
+++ b/tests/baselines/reference/chainedAssignment1.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/chainedAssignment1.ts(21,1): error TS2322: Type 'Z' is not assignable to type 'X'.
-  Property 'a' is missing in type 'Z' but present in type 'X'.
-tests/cases/compiler/chainedAssignment1.ts(21,6): error TS2322: Type 'Z' is not assignable to type 'Y'.
-  Type 'Z' is missing the following properties from type 'Y': a, b
+tests/cases/compiler/chainedAssignment1.ts(21,1): error TS2737: Property 'a' is missing in type 'Z' but present in type 'X'.
+tests/cases/compiler/chainedAssignment1.ts(21,6): error TS2735: Type 'Z' is missing the following properties from type 'Y': a, b
 tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not assignable to type 'Y'.
 
 
@@ -28,11 +26,9 @@ tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not
     var c3 = new Z();
     c1 = c2 = c3; // a bug made this not report the same error as below
     ~~
-!!! error TS2322: Type 'Z' is not assignable to type 'X'.
-!!! error TS2322:   Property 'a' is missing in type 'Z' but present in type 'X'.
+!!! error TS2737: Property 'a' is missing in type 'Z' but present in type 'X'.
          ~~
-!!! error TS2322: Type 'Z' is not assignable to type 'Y'.
-!!! error TS2322:   Type 'Z' is missing the following properties from type 'Y': a, b
+!!! error TS2735: Type 'Z' is missing the following properties from type 'Y': a, b
     c2 = c3; // Error TS111: Cannot convert Z to Y
     ~~
 !!! error TS2322: Type 'Z' is not assignable to type 'Y'.
\ No newline at end of file
diff --git a/tests/baselines/reference/chainedAssignment3.errors.txt b/tests/baselines/reference/chainedAssignment3.errors.txt
index 88620284d24a5..18b6b8b7c7dae 100644
--- a/tests/baselines/reference/chainedAssignment3.errors.txt
+++ b/tests/baselines/reference/chainedAssignment3.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/chainedAssignment3.ts(18,1): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'value' is missing in type 'A' but present in type 'B'.
+tests/cases/compiler/chainedAssignment3.ts(18,1): error TS2737: Property 'value' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not assignable to type 'B'.
 
 
@@ -23,8 +22,7 @@ tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not
     // error cases
     b = a = new A();
     ~
-!!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'value' is missing in type 'A' but present in type 'B'.
+!!! error TS2737: Property 'value' is missing in type 'A' but present in type 'B'.
     a = b = new A();
         ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
diff --git a/tests/baselines/reference/chainedAssignmentChecking.errors.txt b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
index bdf4a0af646ee..6e7acc3816ae4 100644
--- a/tests/baselines/reference/chainedAssignmentChecking.errors.txt
+++ b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/chainedAssignmentChecking.ts(21,1): error TS2322: Type 'Z' is not assignable to type 'X'.
-  Property 'a' is missing in type 'Z' but present in type 'X'.
-tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2322: Type 'Z' is not assignable to type 'Y'.
-  Type 'Z' is missing the following properties from type 'Y': a, b
+tests/cases/compiler/chainedAssignmentChecking.ts(21,1): error TS2737: Property 'a' is missing in type 'Z' but present in type 'X'.
+tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2735: Type 'Z' is missing the following properties from type 'Y': a, b
 
 
 ==== tests/cases/compiler/chainedAssignmentChecking.ts (2 errors) ====
@@ -27,9 +25,7 @@ tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2322: Type 'Z'
     
     c1 = c2 = c3; // Should be error
     ~~
-!!! error TS2322: Type 'Z' is not assignable to type 'X'.
-!!! error TS2322:   Property 'a' is missing in type 'Z' but present in type 'X'.
+!!! error TS2737: Property 'a' is missing in type 'Z' but present in type 'X'.
          ~~
-!!! error TS2322: Type 'Z' is not assignable to type 'Y'.
-!!! error TS2322:   Type 'Z' is missing the following properties from type 'Y': a, b
+!!! error TS2735: Type 'Z' is missing the following properties from type 'Y': a, b
     
\ No newline at end of file
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
index 0b7e8e320f36a..fe7ab53a844c9 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,64): error TS2322: Type 'B' is not assignable to type 'C'.
-  Property 'z' is missing in type 'B' but present in type 'C'.
+tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,64): error TS2737: Property 'z' is missing in type 'B' but present in type 'C'.
 
 
 ==== tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts (1 errors) ====
@@ -23,6 +22,5 @@ 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 TS2322: Type 'B' is not assignable to type 'C'.
-!!! error TS2322:   Property 'z' is missing in type 'B' but present in type 'C'.
+!!! error TS2737: Property 'z' is missing in type 'B' but present in type 'C'.
 !!! 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/checkJsdocTypeTag6.errors.txt b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
index 3c6928dc4f52d..65d5002e46bea 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
+++ b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/jsdoc/test.js(1,5): error TS8030: The type of a function declaration must match the function's signature.
-tests/cases/conformance/jsdoc/test.js(7,5): error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
-  Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
+tests/cases/conformance/jsdoc/test.js(7,5): error TS2737: Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
 tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a function declaration must match the function's signature.
 
 
@@ -15,8 +14,7 @@ tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a functio
     /** @type {{ prop: string }} */
     var g = function (prop) {
         ~
-!!! error TS2322: Type '(prop: any) => void' is not assignable to type '{ prop: string; }'.
-!!! error TS2322:   Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
+!!! error TS2737: Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
     }
     
     /** @type {(a: number) => number} */
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
index b730f2d6d0b2e..b401345a5e1dd 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
@@ -1,8 +1,6 @@
-tests/cases/conformance/jsx/file.tsx(42,11): error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & SingleChildProp'.
-  Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'SingleChildProp'.
-    Types of property 'children' are incompatible.
-      Type 'Element[]' is not assignable to type 'Element'.
-        Type 'Element[]' is missing the following properties from type 'Element': type, props
+tests/cases/conformance/jsx/file.tsx(42,11): error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'SingleChildProp'.
+  Types of property 'children' are incompatible.
+    Type 'Element[]' is missing the following properties from type 'Element': type, props
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -49,8 +47,6 @@ tests/cases/conformance/jsx/file.tsx(42,11): error TS2322: Type '{ children: Ele
     // Error
     let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></SingleChildComp>;
               ~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & SingleChildProp'.
-!!! error TS2322:   Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'SingleChildProp'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type 'Element[]' is not assignable to type 'Element'.
-!!! error TS2322:         Type 'Element[]' is missing the following properties from type 'Element': type, props
\ No newline at end of file
+!!! error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'SingleChildProp'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type 'Element[]' is missing the following properties from type 'Element': type, props
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
index 6d14eb3836ed2..2c74914f62592 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
@@ -1,31 +1,21 @@
-tests/cases/conformance/jsx/file.tsx(14,10): error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-    Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
+tests/cases/conformance/jsx/file.tsx(14,10): error TS2737: Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
 tests/cases/conformance/jsx/file.tsx(17,11): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
-tests/cases/conformance/jsx/file.tsx(31,6): error TS2322: Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
-        Type '(Element | ((name: string) => Element))[]' is not assignable to type 'Element'.
-          Type '(Element | ((name: string) => Element))[]' is missing the following properties from type 'Element': type, props
-tests/cases/conformance/jsx/file.tsx(37,6): error TS2322: Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type '(number | Element)[]' is not assignable to type 'string | Element'.
-        Type '(number | Element)[]' is not assignable to type 'Element'.
-          Type '(number | Element)[]' is missing the following properties from type 'Element': type, props
-tests/cases/conformance/jsx/file.tsx(43,6): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type '(string | Element)[]' is not assignable to type 'string | Element'.
-        Type '(string | Element)[]' is not assignable to type 'Element'.
-          Type '(string | Element)[]' is missing the following properties from type 'Element': type, props
-tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type 'Element[]' is not assignable to type 'string | Element'.
-        Type 'Element[]' is not assignable to type 'Element'.
-          Type 'Element[]' is missing the following properties from type 'Element': type, props
+tests/cases/conformance/jsx/file.tsx(31,6): error TS2322: Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
+      Type '(Element | ((name: string) => Element))[]' is missing the following properties from type 'Element': type, props
+tests/cases/conformance/jsx/file.tsx(37,6): error TS2322: Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type '(number | Element)[]' is not assignable to type 'string | Element'.
+      Type '(number | Element)[]' is missing the following properties from type 'Element': type, props
+tests/cases/conformance/jsx/file.tsx(43,6): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type '(string | Element)[]' is not assignable to type 'string | Element'.
+      Type '(string | Element)[]' is missing the following properties from type 'Element': type, props
+tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type 'Element[]' is not assignable to type 'string | Element'.
+      Type 'Element[]' is missing the following properties from type 'Element': type, props
 
 
 ==== tests/cases/conformance/jsx/file.tsx (6 errors) ====
@@ -44,9 +34,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
     // Error: missing children
     let k = <Comp a={10} b="hi" />;
              ~~~~
-!!! error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
+!!! error TS2737: Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
     
     let k0 =
         <Comp a={10} b="hi" children="Random" >
@@ -67,12 +55,10 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
     let k2 =
         <Comp a={10} b="hi">
          ~~~~
-!!! error TS2322: Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
-!!! error TS2322:         Type '(Element | ((name: string) => Element))[]' is not assignable to type 'Element'.
-!!! error TS2322:           Type '(Element | ((name: string) => Element))[]' is missing the following properties from type 'Element': type, props
+!!! error TS2322: Type '{ children: (Element | ((name: string) => Element))[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
+!!! error TS2322:       Type '(Element | ((name: string) => Element))[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             {(name: string) => <div> My name {name} </div>}
         </Comp>;
@@ -80,12 +66,10 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
     let k3 =
         <Comp a={10} b="hi">
          ~~~~
-!!! error TS2322: Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type '(number | Element)[]' is not assignable to type 'string | Element'.
-!!! error TS2322:         Type '(number | Element)[]' is not assignable to type 'Element'.
-!!! error TS2322:           Type '(number | Element)[]' is missing the following properties from type 'Element': type, props
+!!! error TS2322: Type '{ children: (number | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type '(number | Element)[]' is not assignable to type 'string | Element'.
+!!! error TS2322:       Type '(number | Element)[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             {1000000}
         </Comp>;
@@ -93,12 +77,10 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
     let k4 =
         <Comp a={10} b="hi" >
          ~~~~
-!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'string | Element'.
-!!! error TS2322:         Type '(string | Element)[]' is not assignable to type 'Element'.
-!!! error TS2322:           Type '(string | Element)[]' is missing the following properties from type 'Element': type, props
+!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type '(string | Element)[]' is not assignable to type 'string | Element'.
+!!! error TS2322:       Type '(string | Element)[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             hi hi hi!
         </Comp>;
@@ -106,12 +88,10 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
     let k5 =
         <Comp a={10} b="hi" >
          ~~~~
-!!! error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type 'Element[]' is not assignable to type 'string | Element'.
-!!! error TS2322:         Type 'Element[]' is not assignable to type 'Element'.
-!!! error TS2322:           Type 'Element[]' is missing the following properties from type 'Element': type, props
+!!! error TS2322: Type '{ children: Element[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type 'Element[]' is not assignable to type 'string | Element'.
+!!! error TS2322:       Type 'Element[]' is missing the following properties from type 'Element': type, props
             <div> My Div </div>
             <div> My Div </div>
         </Comp>;
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
index 7ea8470549ba3..d2c2f8239a66d 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
@@ -1,16 +1,10 @@
-tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-    Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
-tests/cases/conformance/jsx/file.tsx(24,6): error TS2322: Type '{ children: Element; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type 'Element' is not assignable to type 'Button'.
-        Type 'Element' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
-tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type 'typeof Button' is not assignable to type 'Button'.
-        Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
+tests/cases/conformance/jsx/file.tsx(20,10): error TS2737: Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
+tests/cases/conformance/jsx/file.tsx(24,6): error TS2322: Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type 'Element' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
+tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -35,28 +29,22 @@ tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: type
     // Error: no children specified
     let k = <Comp a={10} b="hi" />;
              ~~~~
-!!! error TS2322: Type '{ a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
+!!! error TS2737: Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
     
     // Error: JSX.element is not the same as JSX.ElementClass
     let k1 =
         <Comp a={10} b="hi">
          ~~~~
-!!! error TS2322: Type '{ children: Element; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type 'Element' is not assignable to type 'Button'.
-!!! error TS2322:         Type 'Element' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
+!!! error TS2322: Type '{ children: Element; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type 'Element' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
             <Button />
         </Comp>;
     let k2 =
         <Comp a={10} b="hi">
          ~~~~
-!!! error TS2322: Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type 'typeof Button' is not assignable to type 'Button'.
-!!! error TS2322:         Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
+!!! error TS2322: Type '{ children: typeof Button; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
             {Button}
         </Comp>;
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt
index d65e678084f88..6a2325cb82701 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt
@@ -1,20 +1,17 @@
-tests/cases/conformance/jsx/file.tsx(24,11): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
-        Type '(string | Element)[]' is not assignable to type 'Element[]'.
-          Type 'string | Element' is not assignable to type 'Element'.
-            Type 'string' is not assignable to type 'Element'.
-tests/cases/conformance/jsx/file.tsx(25,11): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
-        Type '(string | Element)[]' is not assignable to type 'Element[]'.
-tests/cases/conformance/jsx/file.tsx(27,11): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-  Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-    Types of property 'children' are incompatible.
-      Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
-        Type '(string | Element)[]' is not assignable to type 'Element[]'.
+tests/cases/conformance/jsx/file.tsx(24,11): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
+      Type '(string | Element)[]' is not assignable to type 'Element[]'.
+        Type 'string | Element' is not assignable to type 'Element'.
+          Type 'string' is not assignable to type 'Element'.
+tests/cases/conformance/jsx/file.tsx(25,11): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
+      Type '(string | Element)[]' is not assignable to type 'Element[]'.
+tests/cases/conformance/jsx/file.tsx(27,11): error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+  Types of property 'children' are incompatible.
+    Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
+      Type '(string | Element)[]' is not assignable to type 'Element[]'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -43,26 +40,23 @@ tests/cases/conformance/jsx/file.tsx(27,11): error TS2322: Type '{ children: (st
     // Error: whitespaces matters
     let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
               ~~~~
-!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
-!!! error TS2322:         Type '(string | Element)[]' is not assignable to type 'Element[]'.
-!!! error TS2322:           Type 'string | Element' is not assignable to type 'Element'.
-!!! error TS2322:             Type 'string' is not assignable to type 'Element'.
+!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
+!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'Element[]'.
+!!! error TS2322:         Type 'string | Element' is not assignable to type 'Element'.
+!!! error TS2322:           Type 'string' is not assignable to type 'Element'.
     let k2 = <Comp a={10} b="hi"><Button />
               ~~~~
-!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
-!!! error TS2322:         Type '(string | Element)[]' is not assignable to type 'Element[]'.
+!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
+!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'Element[]'.
         <AnotherButton />  </Comp>;
     let k3 = <Comp a={10} b="hi">    <Button />
               ~~~~
-!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'IntrinsicAttributes & Prop'.
-!!! error TS2322:   Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'children' are incompatible.
-!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
-!!! error TS2322:         Type '(string | Element)[]' is not assignable to type 'Element[]'.
+!!! error TS2322: Type '{ children: (string | Element)[]; a: number; b: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'children' are incompatible.
+!!! error TS2322:     Type '(string | Element)[]' is not assignable to type 'Element | Element[]'.
+!!! error TS2322:       Type '(string | Element)[]' is not assignable to type 'Element[]'.
         <AnotherButton /></Comp>;
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass2.errors.txt b/tests/baselines/reference/classImplementsClass2.errors.txt
index 8bbca48958a68..3e900e123552c 100644
--- a/tests/baselines/reference/classImplementsClass2.errors.txt
+++ b/tests/baselines/reference/classImplementsClass2.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/classImplementsClass2.ts(2,7): error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
   Property 'foo' is missing in type 'C' but present in type 'A'.
-tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is not assignable to type 'C2'.
-  Property 'foo' is missing in type 'C' but present in type 'C2'.
+tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2737: Property 'foo' is missing in type 'C' but present in type 'C2'.
 
 
 ==== tests/cases/compiler/classImplementsClass2.ts (2 errors) ====
@@ -22,5 +21,4 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2322: Type 'C' is n
     c = c2;
     c2 = c;
     ~~
-!!! error TS2322: Type 'C' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'foo' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
+!!! error TS2737: Property 'foo' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass4.errors.txt b/tests/baselines/reference/classImplementsClass4.errors.txt
index fd597ba1b3848..0a11439298921 100644
--- a/tests/baselines/reference/classImplementsClass4.errors.txt
+++ b/tests/baselines/reference/classImplementsClass4.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/classImplementsClass4.ts(5,7): error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
   Property 'x' is missing in type 'C' but present in type 'A'.
-tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is not assignable to type 'C2'.
-  Property 'x' is missing in type 'C' but present in type 'C2'.
+tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2737: Property 'x' is missing in type 'C' but present in type 'C2'.
 
 
 ==== tests/cases/compiler/classImplementsClass4.ts (2 errors) ====
@@ -25,5 +24,4 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2322: Type 'C' is n
     c = c2;
     c2 = c;
     ~~
-!!! error TS2322: Type 'C' is not assignable to type 'C2'.
-!!! error TS2322:   Property 'x' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
+!!! error TS2737: Property 'x' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
index adc246de6988e..6648da249b8f0 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
@@ -1,9 +1,7 @@
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(15,5): error TS2322: Type 'A | B' is not assignable to type 'A'.
-  Type 'B' is not assignable to type 'A'.
-    Property 'propertyA' is missing in type 'B' but present in type 'A'.
+  Property 'propertyA' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(16,5): error TS2322: Type 'A | B' is not assignable to type 'B'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'propertyB' is missing in type 'A' but present in type 'B'.
+  Property 'propertyB' is missing in type 'A' but present in type 'B'.
 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts(19,5): error TS2322: Type '((m: X) => number) | ((n: X) => string)' is not assignable to type '(t: X) => number'.
   Type '(n: X) => string' is not assignable to type '(t: X) => number'.
     Type 'string' is not assignable to type 'number'.
@@ -33,13 +31,11 @@ tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithou
     var result2: A = true ? a : b;
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'A'.
-!!! error TS2322:   Type 'B' is not assignable to type 'A'.
-!!! error TS2322:     Property 'propertyA' is missing in type 'B' but present in type 'A'.
+!!! error TS2322:   Property 'propertyA' is missing in type 'B' but present in type 'A'.
     var result3: B = true ? a : b;
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'B'.
-!!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'propertyB' is missing in type 'A' but present in type 'B'.
+!!! error TS2322:   Property 'propertyB' is missing in type 'A' but present in type 'B'.
     var result31: A | B = true ? a : b;
     
     var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
index bcdbedf7af57e..869f8abce51ae 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
   Types of parameters 'y' and 'e' are incompatible.
-    Type 'Elephant' is not assignable to type 'Giraffe'.
-      Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
+    Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
 
 
 ==== tests/cases/compiler/contextualSignatureInstatiationContravariance.ts (1 errors) ====
@@ -16,8 +15,7 @@ tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): erro
     ~~
 !!! error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
 !!! error TS2322:   Types of parameters 'y' and 'e' are incompatible.
-!!! error TS2322:     Type 'Elephant' is not assignable to type 'Giraffe'.
-!!! error TS2322:       Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
+!!! error TS2322:     Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
     
     var h2: (g1: Giraffe, g2: Giraffe) => void;
     h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypeWithTuple.errors.txt b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
index 5d7f4ce78a2bf..70e6aa978de25 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
@@ -2,18 +2,15 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(3,5): error TS232
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(15,1): error TS2322: Type '[number, string, boolean]' is not assignable to type '[number, string]'.
-tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(18,17): error TS2322: Type '{}' is not assignable to type '{ a: string; }'.
-  Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
-tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(19,1): error TS2322: Type '[number, string]' is not assignable to type '[number, string, boolean]'.
-  Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
+tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(18,17): error TS2737: Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
+tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(19,1): error TS2737: Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(20,5): error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(23,1): error TS2322: Type '[C, string | number, D]' is not assignable to type '[C, string | number]'.
   Types of property 'length' are incompatible.
     Type '3' is not assignable to type '2'.
-tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(24,1): error TS2322: Type '[C, string | number]' is not assignable to type '[C, string | number, D]'.
-  Property '2' is missing in type '[C, string | number]' but present in type '[C, string | number, D]'.
+tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(24,1): error TS2737: Property '2' is missing in type '[C, string | number]' but present in type '[C, string | number, D]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS2322: Type '[number, string | number]' is not assignable to type '[number, string]'.
   Type 'string | number' is not assignable to type 'string'.
     Type 'number' is not assignable to type 'string'.
@@ -45,12 +42,10 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
     // error
     objNumTuple = [ {}, 5];
                     ~~
-!!! error TS2322: Type '{}' is not assignable to type '{ a: string; }'.
-!!! error TS2322:   Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
+!!! error TS2737: Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
     numStrBoolTuple = numStrTuple;
     ~~~~~~~~~~~~~~~
-!!! error TS2322: Type '[number, string]' is not assignable to type '[number, string, boolean]'.
-!!! error TS2322:   Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
+!!! error TS2737: Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
     var strStrTuple: [string, string] = ["foo", "bar", 5];
         ~~~~~~~~~~~
 !!! error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
@@ -65,8 +60,7 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
 !!! error TS2322:     Type '3' is not assignable to type '2'.
     unionTuple2 = unionTuple;
     ~~~~~~~~~~~
-!!! error TS2322: Type '[C, string | number]' is not assignable to type '[C, string | number, D]'.
-!!! error TS2322:   Property '2' is missing in type '[C, string | number]' but present in type '[C, string | number, D]'.
+!!! error TS2737: Property '2' is missing in type '[C, string | number]' but present in type '[C, string | number, D]'.
     numStrTuple = unionTuple3;
     ~~~~~~~~~~~
 !!! error TS2322: Type '[number, string | number]' is not assignable to type '[number, string]'.
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
index ae827a6cf3e38..ab1b7e6352ee5 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
@@ -14,8 +14,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
       Type 'string | number' is not assignable to type 'number'.
         Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(25,5): error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
-  Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
-    Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
+  Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(29,5): error TS2322: Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
   Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
     Types of property 'prop' are incompatible.
@@ -73,8 +72,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
     var objStrOrNum7: { prop: string; anotherP: string; } | { prop: number; anotherP1: number } = {
         ~~~~~~~~~~~~
 !!! error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
-!!! error TS2322:   Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
-!!! error TS2322:     Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
+!!! error TS2322:   Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
         prop: strOrNumber,
         anotherP: str
     };
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index 6af387c8817f3..ec7bc7c1bdc98 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/compiler/contextualTyping.ts(189,18): error TS2384: Overload signatures must all be ambient or non-ambient.
-tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not assignable to type 'B'.
-  Property 'x' is missing in type '{}' but present in type 'B'.
+tests/cases/compiler/contextualTyping.ts(223,5): error TS2737: Property 'x' is missing in type '{}' but present in type 'B'.
 
 
 ==== tests/cases/compiler/contextualTyping.ts (2 errors) ====
@@ -230,6 +229,5 @@ tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not
     interface B extends A { }
     var x: B = { };
         ~
-!!! error TS2322: Type '{}' is not assignable to type 'B'.
-!!! error TS2322:   Property 'x' is missing in type '{}' but present in type 'B'.
+!!! error TS2737: Property 'x' is missing in type '{}' but present in type 'B'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping11.errors.txt b/tests/baselines/reference/contextualTyping11.errors.txt
index db77080a26a05..46d8fb06e0dbe 100644
--- a/tests/baselines/reference/contextualTyping11.errors.txt
+++ b/tests/baselines/reference/contextualTyping11.errors.txt
@@ -1,9 +1,7 @@
-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' but present in type '{ id: number; }'.
+tests/cases/compiler/contextualTyping11.ts(1,42): error TS2737: Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
 
 
 ==== 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:   Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping5.errors.txt b/tests/baselines/reference/contextualTyping5.errors.txt
index 29a0026ef506d..730d9f6926e42 100644
--- a/tests/baselines/reference/contextualTyping5.errors.txt
+++ b/tests/baselines/reference/contextualTyping5.errors.txt
@@ -1,9 +1,7 @@
-tests/cases/compiler/contextualTyping5.ts(1,20): error TS2322: Type '{}' is not assignable to type '{ id: number; }'.
-  Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
+tests/cases/compiler/contextualTyping5.ts(1,20): error TS2737: Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
 
 
 ==== tests/cases/compiler/contextualTyping5.ts (1 errors) ====
     class foo { public bar:{id:number;} = { }; }
                        ~~~
-!!! error TS2322: Type '{}' is not assignable to type '{ id: number; }'.
-!!! error TS2322:   Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/covariantCallbacks.errors.txt b/tests/baselines/reference/covariantCallbacks.errors.txt
index 56225923d9e50..c44e7fdc320f8 100644
--- a/tests/baselines/reference/covariantCallbacks.errors.txt
+++ b/tests/baselines/reference/covariantCallbacks.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(12,5): error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A' but present in type 'B'.
+  Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(17,5): error TS2322: Type 'Promise<A>' is not assignable to type 'Promise<B>'.
   Type 'A' is not assignable to type 'B'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts(30,5): error TS2322: Type 'AList1' is not assignable to type 'BList1'.
@@ -41,8 +40,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covarian
         b = a;  // Error
         ~
 !!! error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
-!!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
     }
     
     function f2(a: Promise<A>, b: Promise<B>) {
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
index 79fd1f4cbc1cd..099f6d8707755 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'.
-  Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
+tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): error TS2737: Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
 
 
 ==== tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts (1 errors) ====
@@ -13,6 +12,5 @@ tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): e
     }
     var a: D = foo("hi", []);
         ~
-!!! error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'.
-!!! error TS2322:   Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
+!!! error TS2737: Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt
index 69778c365a7c5..dc14efd921e2f 100644
--- a/tests/baselines/reference/declarationsAndAssignments.errors.txt
+++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt
@@ -17,8 +17,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,11):
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,14): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,11): error TS2339: Property 'a' does not exist on type 'undefined[]'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,14): error TS2339: Property 'b' does not exist on type 'undefined[]'.
-tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(106,17): error TS2322: Type '{ y: boolean; }' is not assignable to type '{ x: any; y?: boolean; }'.
-  Property 'x' is missing in type '{ y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
+tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(106,17): error TS2737: Property 'x' is missing in type '{ y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,6): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assignable to type 'string'.
 
@@ -169,8 +168,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9):
     f14([2, ["abc", { x: 0 }]]);
     f14([2, ["abc", { y: false }]]);  // Error, no x
                     ~~~~~~~~~~~~
-!!! error TS2322: Type '{ y: boolean; }' is not assignable to type '{ x: any; y?: boolean; }'.
-!!! error TS2322:   Property 'x' is missing in type '{ y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
+!!! error TS2737: Property 'x' is missing in type '{ y: boolean; }' but present in type '{ x: any; y?: boolean; }'.
     
     module M {
         export var [a, b] = [1, 2];
diff --git a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
index f81e4b7a1cd41..4d80ee6a638fe 100644
--- a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
+++ b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22:17 - error TS2322: Type '{}' is not assignable to type 'A'.
-  Property 'a' is missing in type '{}' but present in type 'A'.
+tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22:17 - error TS2737: Property 'a' is missing in type '{}' but present in type 'A'.
 
 22                 thing: {}
                    ~~~~~
@@ -8,8 +7,7 @@
     9                 thing: A;
                       ~~~~~
     The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
-tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:25:17 - error TS2322: Type '{}' is not assignable to type 'A'.
-  Property 'a' is missing in type '{}' but present in type 'A'.
+tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:25:17 - error TS2737: Property 'a' is missing in type '{}' but present in type 'A'.
 
 25                 another: {}
                    ~~~~~~~
@@ -44,15 +42,13 @@
                 more: {
                     thing: {}
                     ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'A'.
-!!! error TS2322:   Property 'a' is missing in type '{}' but present in type 'A'.
+!!! error TS2737: Property 'a' is missing in type '{}' but present in type 'A'.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17: The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
                 },
                 yetstill: {
                     another: {}
                     ~~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'A'.
-!!! error TS2322:   Property 'a' is missing in type '{}' but present in type 'A'.
+!!! error TS2737: Property 'a' is missing in type '{}' but present in type 'A'.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17: The expected type comes from property 'another' which is declared here on type '{ another: A; }'
                 }
             }
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt
index f6742934b131e..4d5769f616f09 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt
@@ -4,10 +4,8 @@ tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAss
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(3,12): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(4,5): error TS2461: Type 'undefined' is not an array type.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(9,51): error TS2322: Type 'number' is not assignable to type 'boolean'.
-tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(22,5): error TS2322: Type 'number[]' is not assignable to type '[number, number]'.
-  Type 'number[]' is missing the following properties from type '[number, number]': 0, 1
-tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(23,5): error TS2322: Type 'number[]' is not assignable to type '[string, string]'.
-  Type 'number[]' is missing the following properties from type '[string, string]': 0, 1
+tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(22,5): error TS2735: Type 'number[]' is missing the following properties from type '[number, number]': 0, 1
+tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(23,5): error TS2735: Type 'number[]' is missing the following properties from type '[string, string]': 0, 1
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(34,5): error TS2461: Type 'F' is not an array type.
 
 
@@ -47,12 +45,10 @@ tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAss
     var temp = [1, 2, 3]
     var [c0, c1]: [number, number] = [...temp];  // Error
         ~~~~~~~~
-!!! error TS2322: Type 'number[]' is not assignable to type '[number, number]'.
-!!! error TS2322:   Type 'number[]' is missing the following properties from type '[number, number]': 0, 1
+!!! error TS2735: Type 'number[]' is missing the following properties from type '[number, number]': 0, 1
     var [c2, c3]: [string, string] = [...temp];  // Error
         ~~~~~~~~
-!!! error TS2322: Type 'number[]' is not assignable to type '[string, string]'.
-!!! error TS2322:   Type 'number[]' is missing the following properties from type '[string, string]': 0, 1
+!!! error TS2735: Type 'number[]' is missing the following properties from type '[string, string]': 0, 1
     
     interface F {
         [idx: number]: boolean
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
index 51eb90af27224..8609a78889cc6 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
@@ -21,8 +21,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(57,5): error TS2416: Property 'd4' in type 'C4' is not assignable to the same property in base type 'F2'.
   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
     Types of parameters '__0' and '__0' are incompatible.
-      Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
-        Property 'c' is missing in type '{ x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
+      Property 'c' is missing in type '{ x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,18): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,26): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,34): error TS2300: Duplicate identifier 'number'.
@@ -131,8 +130,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2416: Property 'd4' in type 'C4' is not assignable to the same property in base type 'F2'.
 !!! error TS2416:   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
 !!! error TS2416:     Types of parameters '__0' and '__0' are incompatible.
-!!! error TS2416:       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
-!!! error TS2416:         Property 'c' is missing in type '{ x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
+!!! error TS2416:       Property 'c' is missing in type '{ x: any; y: any; z: any; }' but present in type '{ x: any; y: any; c: any; }'.
         e0([a, b, q]) { }
     }
     
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
index 1cec6a88b18c5..30d42471acc13 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(47,6): error TS2322: Type 'Class' is not assignable to type 'D'.
-  Property 'foo' is missing in type 'Class' but present in type 'D'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(47,6): error TS2737: Property 'foo' is missing in type 'Class' but present in type 'D'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2737: Property 'y' is missing in type '{}' but present in type '{ y: D; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(49,6): error TS2322: Type 'number' is not assignable to type 'D'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(50,6): error TS2322: Type 'string' is not assignable to type 'D'.
@@ -54,8 +53,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(
     // Error
     d3({ y: new Class() });
          ~
-!!! error TS2322: Type 'Class' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo' is missing in type 'Class' but present in type 'D'.
+!!! error TS2737: Property 'foo' is missing in type 'Class' but present in type 'D'.
 !!! related TS6500 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: The expected type comes from property 'y' which is declared here on type '{ y: D; }'
     d3({});
        ~~
diff --git a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
index f243e6e6f764e..c167b833bd751 100644
--- a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
+++ b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(10,8): error TS2322: Type 'typeof Bar' is not assignable to type 'Bar'.
-  Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
-tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(11,8): error TS2322: Type 'DateConstructor' is not assignable to type 'Date'.
-  Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
+tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(10,8): error TS2737: Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
+tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(11,8): error TS2736: Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(17,4): error TS2345: Argument of type '() => number' is not assignable to parameter of type 'number'.
 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(26,5): error TS2322: Type '() => number' is not assignable to type 'number'.
 
@@ -18,13 +16,11 @@ tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(2
     foo({
         x: Bar,
            ~~~
-!!! error TS2322: Type 'typeof Bar' is not assignable to type 'Bar'.
-!!! error TS2322:   Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
+!!! error TS2737: Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
 !!! related TS6213 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:10:8: Did you mean to use 'new' with this expression?
         y: Date
            ~~~~
-!!! error TS2322: Type 'DateConstructor' is not assignable to type 'Date'.
-!!! error TS2322:   Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
+!!! error TS2736: Type 'DateConstructor' is missing the following properties from type 'Date': toDateString, toTimeString, toLocaleDateString, toLocaleTimeString, and 37 more.
 !!! related TS6213 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:11:8: Did you mean to use 'new' with this expression?
     }, getNum());
     
diff --git a/tests/baselines/reference/elaboratedErrors.errors.txt b/tests/baselines/reference/elaboratedErrors.errors.txt
index 4757d5478d86e..82370a26ca76b 100644
--- a/tests/baselines/reference/elaboratedErrors.errors.txt
+++ b/tests/baselines/reference/elaboratedErrors.errors.txt
@@ -1,10 +1,8 @@
 tests/cases/compiler/elaboratedErrors.ts(11,3): error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'FileSystem'.
   Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/elaboratedErrors.ts(20,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-  Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
+tests/cases/compiler/elaboratedErrors.ts(20,1): error TS2737: Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
 tests/cases/compiler/elaboratedErrors.ts(21,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-tests/cases/compiler/elaboratedErrors.ts(24,1): error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
-  Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
+tests/cases/compiler/elaboratedErrors.ts(24,1): error TS2737: Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
 tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
 
 
@@ -33,8 +31,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     // Only one of these errors should be large
     x = y;
     ~
-!!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
-!!! error TS2322:   Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
+!!! error TS2737: Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
     x = y;
     ~
 !!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
@@ -42,8 +39,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     // Only one of these errors should be large
     y = x;
     ~
-!!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
-!!! error TS2322:   Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
+!!! error TS2737: Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
     y = x;
     ~
 !!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
diff --git a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
index a941fdfdda3a1..d38762a76b4d9 100644
--- a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
+++ b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
@@ -4,8 +4,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(14,12): error TS2322: Typ
       Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
-    Type 'ctor' is not assignable to type '{ somePropA: any; }'.
-      Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
+    Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
 
 
 ==== tests/cases/compiler/errorsWithInvokablesInUnions01.ts (2 errors) ====
@@ -33,8 +32,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Typ
                ~~~~
 !!! error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
 !!! error TS2322:   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
-!!! error TS2322:     Type 'ctor' is not assignable to type '{ somePropA: any; }'.
-!!! error TS2322:       Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
+!!! error TS2322:     Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
         someUnaccountedProp: any;
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
index 5f1fefc852b7b..5ad74fc964dc6 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
@@ -2,12 +2,9 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(35,5): error TS2322: Type '9.9' is not assignable to type 'string'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(36,5): error TS2322: Type '9.9' is not assignable to type 'Date'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(38,5): error TS2322: Type '9.9' is not assignable to type 'void'.
-tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(40,5): error TS2322: Type 'D<{}>' is not assignable to type 'I'.
-  Property 'id' is missing in type 'D<{}>' but present in type 'I'.
-tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(41,5): error TS2322: Type 'D<{}>' is not assignable to type 'C'.
-  Property 'id' is missing in type 'D<{}>' but present in type 'C'.
-tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(42,5): error TS2322: Type 'C' is not assignable to type 'D<string>'.
-  Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
+tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(40,5): error TS2737: Property 'id' is missing in type 'D<{}>' but present in type 'I'.
+tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(41,5): error TS2737: Property 'id' is missing in type 'D<{}>' but present in type 'C'.
+tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(42,5): error TS2735: Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(43,28): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(44,5): error TS2322: Type 'C' is not assignable to type '{ id: string; }'.
   Types of property 'id' are incompatible.
@@ -22,8 +19,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 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'.
-      Type 'N.A' is not assignable to type 'M.A'.
-        Property 'name' is missing in type 'A' but present in type 'A'.
+      Property 'name' is missing in type 'A' but present in type 'A'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(51,5): error TS2322: Type 'N.A' is not assignable to type 'M.A'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(52,5): error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: number) => string'.
   Type 'boolean' is not assignable to type 'string'.
@@ -79,16 +75,13 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
     
     var anInterface: I = new D();
         ~~~~~~~~~~~
-!!! error TS2322: Type 'D<{}>' is not assignable to type 'I'.
-!!! error TS2322:   Property 'id' is missing in type 'D<{}>' but present in type 'I'.
+!!! error TS2737: Property 'id' is missing in type 'D<{}>' but present in type 'I'.
     var aClass: C = new D();
         ~~~~~~
-!!! error TS2322: Type 'D<{}>' is not assignable to type 'C'.
-!!! error TS2322:   Property 'id' is missing in type 'D<{}>' but present in type 'C'.
+!!! error TS2737: Property 'id' is missing in type 'D<{}>' but present in type 'C'.
     var aGenericClass: D<string> = new C();
         ~~~~~~~~~~~~~
-!!! error TS2322: Type 'C' is not assignable to type 'D<string>'.
-!!! error TS2322:   Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
+!!! error TS2735: Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
     var anObjectLiteral: I = { id: 'a string' };
                                ~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
@@ -119,8 +112,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 !!! error TS2322: Type 'typeof N' is not assignable to type 'typeof M'.
 !!! error TS2322:   Types of property 'A' are incompatible.
 !!! error TS2322:     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
-!!! error TS2322:       Type 'N.A' is not assignable to type 'M.A'.
-!!! error TS2322:         Property 'name' is missing in type 'A' but present in type 'A'.
+!!! error TS2322:       Property 'name' is missing in type 'A' but present in type 'A'.
     var aClassInModule: M.A = new N.A();
         ~~~~~~~~~~~~~~
 !!! error TS2322: Type 'N.A' is not assignable to type 'M.A'.
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
index 3de40194b1026..5ba4ae0b54bc8 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
@@ -3,8 +3,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(10,30): error TS2322: Type
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(11,21): error TS2322: Type '{ tag: "A"; d20: number; }' is not assignable to type 'ADT'.
   Object literal may only specify known properties, and 'd20' does not exist in type '{ tag: "A"; a1: string; }'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(12,1): error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
-  Type '{ tag: "D"; }' is not assignable to type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
-    Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
+  Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(33,28): error TS2322: Type '{ tag: "A"; x: string; extra: number; }' is not assignable to type 'Ambiguous'.
   Object literal may only specify known properties, and 'extra' does not exist in type 'Ambiguous'.
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(34,26): error TS2322: Type '{ tag: "A"; y: number; extra: number; }' is not assignable to type 'Ambiguous'.
@@ -49,8 +48,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(66,9): error TS2322: Type
     wrong = { tag: "D" }
     ~~~~~
 !!! error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
-!!! error TS2322:   Type '{ tag: "D"; }' is not assignable to type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
-!!! error TS2322:     Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
+!!! error TS2322:   Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
     
     type Ambiguous = {
         tag: "A",
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
index 106bfe82a2c5a..072748a4cf444 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Type 'Base' is not assignable to type 'Derived'.
-  Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
+tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2737: Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
 
 
 ==== tests/cases/compiler/fixingTypeParametersRepeatedly2.ts (1 errors) ====
@@ -15,8 +14,7 @@ tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2322: Ty
     declare function foo<T>(x: T, func: (p: T) => T): T;
     var result = foo(derived, d => d.toBase());
                                    ~~~~~~~~~~
-!!! error TS2322: Type 'Base' is not assignable to type 'Derived'.
-!!! error TS2322:   Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
+!!! error TS2737: Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
 !!! 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.
diff --git a/tests/baselines/reference/for-of31.errors.txt b/tests/baselines/reference/for-of31.errors.txt
index 2a85abc561dc5..e7ab90742776d 100644
--- a/tests/baselines/reference/for-of31.errors.txt
+++ b/tests/baselines/reference/for-of31.errors.txt
@@ -4,8 +4,7 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
       Type 'StringIterator' is not assignable to type 'Iterator<string>'.
         Types of property 'next' are incompatible.
           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
-            Type '{ value: string; }' is not assignable to type 'IteratorResult<string>'.
-              Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
+            Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
 
 
 ==== tests/cases/conformance/es6/for-ofStatements/for-of31.ts (1 errors) ====
@@ -30,5 +29,4 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
 !!! error TS2322:       Type 'StringIterator' is not assignable to type 'Iterator<string>'.
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
-!!! error TS2322:             Type '{ value: string; }' is not assignable to type 'IteratorResult<string>'.
-!!! error TS2322:               Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
\ No newline at end of file
+!!! error TS2322:             Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads41.errors.txt b/tests/baselines/reference/functionOverloads41.errors.txt
index 92e4c6fcf8740..361bf6fd6b3fd 100644
--- a/tests/baselines/reference/functionOverloads41.errors.txt
+++ b/tests/baselines/reference/functionOverloads41.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
-  Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
+tests/cases/compiler/functionOverloads41.ts(4,14): error TS2737: Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
 
 
 ==== tests/cases/compiler/functionOverloads41.ts (1 errors) ====
@@ -8,6 +7,5 @@ tests/cases/compiler/functionOverloads41.ts(4,14): error TS2322: Type '{}' is no
     function foo(bar:{a:any;}[]):any{ return bar }
     var x = foo([{}]);
                  ~~
-!!! error TS2322: Type '{}' is not assignable to type '{ a: boolean; }'.
-!!! error TS2322:   Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
+!!! error TS2737: Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck18.errors.txt b/tests/baselines/reference/generatorTypeCheck18.errors.txt
index 91a67a4cde87e..5018503e50e26 100644
--- a/tests/baselines/reference/generatorTypeCheck18.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck18.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-  Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): error TS2737: Property 'x' is missing in type 'Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts (1 errors) ====
@@ -9,6 +8,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): erro
         yield;
         yield new Baz;
               ~~~~~~~
-!!! error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+!!! error TS2737: Property 'x' is missing in type 'Baz' but present in type 'Foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck20.errors.txt b/tests/baselines/reference/generatorTypeCheck20.errors.txt
index 6b53b658059aa..234caf5bcb69f 100644
--- a/tests/baselines/reference/generatorTypeCheck20.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck20.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-  Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): error TS2737: Property 'x' is missing in type 'Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts (1 errors) ====
@@ -9,6 +8,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): erro
         yield;
         yield * [new Baz];
                 ~~~~~~~~~
-!!! error TS2322: Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+!!! error TS2737: Property 'x' is missing in type 'Baz' but present in type 'Foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck25.errors.txt b/tests/baselines/reference/generatorTypeCheck25.errors.txt
index 35062c4bfaccf..f4b8c43430d30 100644
--- a/tests/baselines/reference/generatorTypeCheck25.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck25.errors.txt
@@ -7,8 +7,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
             Type '(value?: any) => IteratorResult<Bar | Baz>' is not assignable to type '(value?: any) => IteratorResult<Foo>'.
               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
                 Type 'Bar | Baz' is not assignable to type 'Foo'.
-                  Type 'Baz' is not assignable to type 'Foo'.
-                    Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+                  Property 'x' is missing in type 'Baz' but present in type 'Foo'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts (1 errors) ====
@@ -26,8 +25,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
 !!! error TS2322:             Type '(value?: any) => IteratorResult<Bar | Baz>' is not assignable to type '(value?: any) => IteratorResult<Foo>'.
 !!! error TS2322:               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
 !!! error TS2322:                 Type 'Bar | Baz' is not assignable to type 'Foo'.
-!!! error TS2322:                   Type 'Baz' is not assignable to type 'Foo'.
-!!! error TS2322:                     Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+!!! error TS2322:                   Property 'x' is missing in type 'Baz' but present in type 'Foo'.
         yield;
         yield new Bar;
         yield new Baz;
diff --git a/tests/baselines/reference/generatorTypeCheck7.errors.txt b/tests/baselines/reference/generatorTypeCheck7.errors.txt
index e4655e8267f60..e5c5abbaa86aa 100644
--- a/tests/baselines/reference/generatorTypeCheck7.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck7.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error TS2322: Type 'IterableIterator<number>' is not assignable to type 'WeirdIter'.
-  Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error TS2737: Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts (1 errors) ====
@@ -8,5 +7,4 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error
     }
     function* g1(): WeirdIter { }
                     ~~~~~~~~~
-!!! error TS2322: Type 'IterableIterator<number>' is not assignable to type 'WeirdIter'.
-!!! error TS2322:   Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
\ No newline at end of file
+!!! error TS2737: Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
index 8a2b5778737e3..f9fd2abea6676 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts(18,32): error TS2322: Type 'Derived2' is not assignable to type 'Derived'.
-  Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts(18,32): error TS2737: Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts (1 errors) ====
@@ -22,8 +21,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     
     var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other
                                    ~
-!!! error TS2322: Type 'Derived2' is not assignable to type 'Derived'.
-!!! error TS2322:   Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
+!!! error TS2737: Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
 !!! related TS6500 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts:13:39: The expected type comes from property 'y' which is declared here on type '{ x: Derived; y: Derived; }'
     
     function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
diff --git a/tests/baselines/reference/genericCallWithTupleType.errors.txt b/tests/baselines/reference/genericCallWithTupleType.errors.txt
index c1f3f7af4f793..b5ef2b5c04e20 100644
--- a/tests/baselines/reference/genericCallWithTupleType.errors.txt
+++ b/tests/baselines/reference/genericCallWithTupleType.errors.txt
@@ -9,8 +9,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(22,17): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,14): error TS2322: Type '{}' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,18): error TS2322: Type '{}' is not assignable to type 'number'.
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(24,1): error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
-  Property '1' is missing in type '[{}]' but present in type '[{}, {}]'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(24,1): error TS2737: Property '1' is missing in type '[{}]' but present in type '[{}, {}]'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts (10 errors) ====
@@ -59,6 +58,5 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
 !!! error TS2322: Type '{}' is not assignable to type 'number'.
     i2.tuple1 = [{}];
     ~~~~~~~~~
-!!! error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
-!!! error TS2322:   Property '1' is missing in type '[{}]' but present in type '[{}, {}]'.
+!!! error TS2737: Property '1' is missing in type '[{}]' but present in type '[{}, {}]'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index a263841f858cd..505457eefeee2 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -13,8 +13,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(17,1): error TS2322
 tests/cases/conformance/types/rest/genericRestParameters3.ts(18,1): error TS2322: Type '(x: string, y: number, z: boolean) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
   Types of parameters 'y' and 'args' are incompatible.
     Type '[string] | [number, boolean]' is not assignable to type '[number, boolean]'.
-      Type '[string]' is not assignable to type '[number, boolean]'.
-        Property '1' is missing in type '[string]' but present in type '[number, boolean]'.
+      Property '1' is missing in type '[string]' but present in type '[number, boolean]'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(19,1): error TS2322: Type '(...args: [string, string] | [string, number, boolean]) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(29,1): error TS2554: Expected 1 arguments, but got 0.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(30,21): error TS2345: Argument of type '100' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
@@ -69,8 +68,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
 !!! error TS2322: Type '(x: string, y: number, z: boolean) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
 !!! error TS2322:   Types of parameters 'y' and 'args' are incompatible.
 !!! error TS2322:     Type '[string] | [number, boolean]' is not assignable to type '[number, boolean]'.
-!!! error TS2322:       Type '[string]' is not assignable to type '[number, boolean]'.
-!!! error TS2322:         Property '1' is missing in type '[string]' but present in type '[number, boolean]'.
+!!! error TS2322:       Property '1' is missing in type '[string]' but present in type '[number, boolean]'.
     f1 = f4;  // Error, misaligned complex rest types
     ~~
 !!! error TS2322: Type '(...args: [string, string] | [string, number, boolean]) => void' is not assignable to type '(x: string, ...args: [string] | [number, boolean]) => void'.
diff --git a/tests/baselines/reference/genericTypeAssertions2.errors.txt b/tests/baselines/reference/genericTypeAssertions2.errors.txt
index 242ba3a7d3c3d..c21dfd8719764 100644
--- a/tests/baselines/reference/genericTypeAssertions2.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions2.errors.txt
@@ -3,8 +3,7 @@ tests/cases/compiler/genericTypeAssertions2.ts(10,5): error TS2322: Type 'B<stri
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/genericTypeAssertions2.ts(11,5): error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
-  Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
+tests/cases/compiler/genericTypeAssertions2.ts(11,5): error TS2737: Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
 tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'foo' is missing in type 'undefined[]' but present in type 'A<number>'.
 
 
@@ -27,8 +26,7 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'f
 !!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var r3: B<number> = <A<number>>new B(); // error
         ~~
-!!! error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
-!!! error TS2322:   Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
+!!! error TS2737: Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
     var r4: A<number> = <A<number>>new A();
     var r5: A<number> = <A<number>>[]; // error
                         ~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
index 1258759923620..a7fe83509f2a2 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
-  Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-    Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+  Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
 tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
 
@@ -18,8 +17,7 @@ tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of ty
     let p1: Promise<typeof anotherModule> = import("./defaultPath");
         ~~
 !!! error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
-!!! error TS2322:   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
-!!! error TS2322:     Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! error TS2322:   Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
     let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
diff --git a/tests/baselines/reference/incompatibleTypes.errors.txt b/tests/baselines/reference/incompatibleTypes.errors.txt
index 1e3ad1fa5c5b9..3da9adcd2b77b 100644
--- a/tests/baselines/reference/incompatibleTypes.errors.txt
+++ b/tests/baselines/reference/incompatibleTypes.errors.txt
@@ -8,8 +8,7 @@ tests/cases/compiler/incompatibleTypes.ts(16,12): error TS2416: Property 'p1' in
 tests/cases/compiler/incompatibleTypes.ts(26,12): error TS2416: Property 'p1' in type 'C3' is not assignable to the same property in base type 'IFoo3'.
   Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/incompatibleTypes.ts(34,12): error TS2416: Property 'p1' in type 'C4' is not assignable to the same property in base type 'IFoo4'.
-  Type '{ c: { b: string; }; d: string; }' is not assignable to type '{ a: { a: string; }; b: string; }'.
-    Type '{ c: { b: string; }; d: string; }' is missing the following properties from type '{ a: { a: string; }; b: string; }': a, b
+  Type '{ c: { b: string; }; d: string; }' is missing the following properties from type '{ a: { a: string; }; b: string; }': a, b
 tests/cases/compiler/incompatibleTypes.ts(42,5): error TS2345: Argument of type 'C1' is not assignable to parameter of type 'IFoo2'.
   Types of property 'p1' are incompatible.
     Type '() => string' is not assignable to type '(s: string) => number'.
@@ -71,8 +70,7 @@ tests/cases/compiler/incompatibleTypes.ts(74,5): error TS2322: Type '(a: any) =>
         public p1: { c: { b: string; }; d: string; };
                ~~
 !!! error TS2416: Property 'p1' in type 'C4' is not assignable to the same property in base type 'IFoo4'.
-!!! error TS2416:   Type '{ c: { b: string; }; d: string; }' is not assignable to type '{ a: { a: string; }; b: string; }'.
-!!! error TS2416:     Type '{ c: { b: string; }; d: string; }' is missing the following properties from type '{ a: { a: string; }; b: string; }': a, b
+!!! error TS2416:   Type '{ c: { b: string; }; d: string; }' is missing the following properties from type '{ a: { a: string; }; b: string; }': a, b
     }
     
     function if1(i: IFoo1): void;
diff --git a/tests/baselines/reference/inheritance1.errors.txt b/tests/baselines/reference/inheritance1.errors.txt
index 3085b31b3c215..d7f3cd1080f83 100644
--- a/tests/baselines/reference/inheritance1.errors.txt
+++ b/tests/baselines/reference/inheritance1.errors.txt
@@ -2,26 +2,16 @@ tests/cases/compiler/inheritance1.ts(14,7): error TS2420: Class 'ImageBase' inco
   Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
 tests/cases/compiler/inheritance1.ts(18,7): error TS2420: Class 'Locations' incorrectly implements interface 'SelectableControl'.
   Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
-tests/cases/compiler/inheritance1.ts(31,1): error TS2322: Type 'Control' is not assignable to type 'Button'.
-  Property 'select' is missing in type 'Control' but present in type 'Button'.
-tests/cases/compiler/inheritance1.ts(37,1): error TS2322: Type 'Control' is not assignable to type 'TextBox'.
-  Property 'select' is missing in type 'Control' but present in type 'TextBox'.
-tests/cases/compiler/inheritance1.ts(40,1): error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
-  Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
-tests/cases/compiler/inheritance1.ts(46,1): error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
-  Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
-tests/cases/compiler/inheritance1.ts(52,1): error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
-  Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
-tests/cases/compiler/inheritance1.ts(53,1): error TS2322: Type 'Locations' is not assignable to type 'Control'.
-  Property 'state' is missing in type 'Locations' but present in type 'Control'.
-tests/cases/compiler/inheritance1.ts(55,1): error TS2322: Type 'Control' is not assignable to type 'Locations'.
-  Property 'select' is missing in type 'Control' but present in type 'Locations'.
-tests/cases/compiler/inheritance1.ts(58,1): error TS2322: Type 'Locations1' is not assignable to type 'SelectableControl'.
-  Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
-tests/cases/compiler/inheritance1.ts(59,1): error TS2322: Type 'Locations1' is not assignable to type 'Control'.
-  Property 'state' is missing in type 'Locations1' but present in type 'Control'.
-tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not assignable to type 'Locations1'.
-  Property 'select' is missing in type 'Control' but present in type 'Locations1'.
+tests/cases/compiler/inheritance1.ts(31,1): error TS2737: Property 'select' is missing in type 'Control' but present in type 'Button'.
+tests/cases/compiler/inheritance1.ts(37,1): error TS2737: Property 'select' is missing in type 'Control' but present in type 'TextBox'.
+tests/cases/compiler/inheritance1.ts(40,1): error TS2737: Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
+tests/cases/compiler/inheritance1.ts(46,1): error TS2737: Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
+tests/cases/compiler/inheritance1.ts(52,1): error TS2737: Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
+tests/cases/compiler/inheritance1.ts(53,1): error TS2737: Property 'state' is missing in type 'Locations' but present in type 'Control'.
+tests/cases/compiler/inheritance1.ts(55,1): error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations'.
+tests/cases/compiler/inheritance1.ts(58,1): error TS2737: Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
+tests/cases/compiler/inheritance1.ts(59,1): error TS2737: Property 'state' is missing in type 'Locations1' but present in type 'Control'.
+tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations1'.
 
 
 ==== tests/cases/compiler/inheritance1.ts (12 errors) ====
@@ -63,8 +53,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     b = sc;
     b = c;
     ~
-!!! error TS2322: Type 'Control' is not assignable to type 'Button'.
-!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'Button'.
+!!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Button'.
     
     var t: TextBox;
     sc = t;
@@ -72,14 +61,12 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     t = sc;
     t = c;
     ~
-!!! error TS2322: Type 'Control' is not assignable to type 'TextBox'.
-!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'TextBox'.
+!!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'TextBox'.
     
     var i: ImageBase;
     sc = i;
     ~~
-!!! error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
+!!! error TS2737: Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
     c = i;
     i = sc;
     i = c;
@@ -87,8 +74,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     var i1: Image1;
     sc = i1;
     ~~
-!!! error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
+!!! error TS2737: Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
     c = i1;
     i1 = sc;
     i1 = c;
@@ -96,29 +82,23 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     var l: Locations;
     sc = l;
     ~~
-!!! error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
+!!! error TS2737: Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
     c = l;
     ~
-!!! error TS2322: Type 'Locations' is not assignable to type 'Control'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations' but present in type 'Control'.
+!!! error TS2737: Property 'state' is missing in type 'Locations' but present in type 'Control'.
     l = sc;
     l = c;
     ~
-!!! error TS2322: Type 'Control' is not assignable to type 'Locations'.
-!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'Locations'.
+!!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations'.
     
     var l1: Locations1;
     sc = l1;
     ~~
-!!! error TS2322: Type 'Locations1' is not assignable to type 'SelectableControl'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
+!!! error TS2737: Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
     c = l1;
     ~
-!!! error TS2322: Type 'Locations1' is not assignable to type 'Control'.
-!!! error TS2322:   Property 'state' is missing in type 'Locations1' but present in type 'Control'.
+!!! error TS2737: Property 'state' is missing in type 'Locations1' but present in type 'Control'.
     l1 = sc;
     l1 = c;
     ~~
-!!! error TS2322: Type 'Control' is not assignable to type 'Locations1'.
-!!! error TS2322:   Property 'select' is missing in type 'Control' but present in type 'Locations1'.
\ No newline at end of file
+!!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
index 7421b2a1a72c5..32f2cc5deec64 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-  Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
+tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2737: Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
 tests/cases/conformance/jsx/inline/index.tsx(21,22): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
@@ -9,8 +8,7 @@ tests/cases/conformance/jsx/inline/index.tsx(21,63): error TS2605: JSX element t
 tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
-      Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
-        Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
+      Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
 
 
 ==== tests/cases/conformance/jsx/inline/renderer.d.ts (0 errors) ====
@@ -80,8 +78,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
     let elem = prerendered;
     elem = <h></h>; // Expect assignability error here
     ~~~~
-!!! error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-!!! error TS2322:   Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
+!!! error TS2737: Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
     
     const DOMSFC = (props: {x: number, y: number, children?: dom.JSX.Element[]}) => <p>{props.x} + {props.y} = {props.x + props.y}{props.children}</p>;
     
@@ -114,6 +111,5 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
 !!! error TS2322:   Types of property 'children' are incompatible.
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
-!!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
-!!! error TS2322:         Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
+!!! error TS2322:       Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
index 813e72006e322..8184578ffb446 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-  Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
+tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2737: Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
 
 
 ==== tests/cases/conformance/jsx/inline/renderer.d.ts (0 errors) ====
@@ -46,6 +45,5 @@ tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2322: Type 'JSX.Eleme
     let elem = prerendered;
     elem = <h></h>; // Expect assignability error here
     ~~~~
-!!! error TS2322: Type 'JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-!!! error TS2322:   Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
+!!! error TS2737: Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intTypeCheck.errors.txt b/tests/baselines/reference/intTypeCheck.errors.txt
index a0e9ca0a9e515..cd5edee2414c8 100644
--- a/tests/baselines/reference/intTypeCheck.errors.txt
+++ b/tests/baselines/reference/intTypeCheck.errors.txt
@@ -1,14 +1,10 @@
 tests/cases/compiler/intTypeCheck.ts(35,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/intTypeCheck.ts(71,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/intTypeCheck.ts(85,5): error TS2386: Overload signatures must all be optional or required.
-tests/cases/compiler/intTypeCheck.ts(99,5): error TS2322: Type 'Object' is not assignable to type 'i1'.
-  The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Type 'Object' is missing the following properties from type 'i1': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(99,5): error TS2735: Type 'Object' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(100,16): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(101,5): error TS2322: Type 'Base' is not assignable to type 'i1'.
-  Type 'Base' is missing the following properties from type 'i1': p, p3, p6
-tests/cases/compiler/intTypeCheck.ts(103,5): error TS2322: Type '() => void' is not assignable to type 'i1'.
-  Type '() => void' is missing the following properties from type 'i1': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(101,5): error TS2735: Type 'Base' is missing the following properties from type 'i1': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(103,5): error TS2735: Type '() => void' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(106,5): error TS2322: Type 'boolean' is not assignable to type 'i1'.
 tests/cases/compiler/intTypeCheck.ts(106,20): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(106,21): error TS2693: 'i1' only refers to a type, but is being used as a value here.
@@ -43,16 +39,11 @@ tests/cases/compiler/intTypeCheck.ts(148,5): error TS2322: Type 'boolean' is not
 tests/cases/compiler/intTypeCheck.ts(148,21): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(148,22): error TS2693: 'i4' only refers to a type, but is being used as a value here.
 tests/cases/compiler/intTypeCheck.ts(149,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(154,5): error TS2322: Type '{}' is not assignable to type 'i5'.
-  Type '{}' is missing the following properties from type 'i5': p, p3, p6
-tests/cases/compiler/intTypeCheck.ts(155,5): error TS2322: Type 'Object' is not assignable to type 'i5'.
-  The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-    Type 'Object' is missing the following properties from type 'i5': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(154,5): error TS2735: Type '{}' is missing the following properties from type 'i5': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(155,5): error TS2735: Type 'Object' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(156,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(157,5): error TS2322: Type 'Base' is not assignable to type 'i5'.
-  Type 'Base' is missing the following properties from type 'i5': p, p3, p6
-tests/cases/compiler/intTypeCheck.ts(159,5): error TS2322: Type '() => void' is not assignable to type 'i5'.
-  Type '() => void' is missing the following properties from type 'i5': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(157,5): error TS2735: Type 'Base' is missing the following properties from type 'i5': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(159,5): error TS2735: Type '() => void' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(162,5): error TS2322: Type 'boolean' is not assignable to type 'i5'.
 tests/cases/compiler/intTypeCheck.ts(162,21): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(162,22): error TS2693: 'i5' only refers to a type, but is being used as a value here.
@@ -198,21 +189,17 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
     };
     var obj2: i1 = new Object();
         ~~~~
-!!! error TS2322: Type 'Object' is not assignable to type 'i1'.
-!!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Type 'Object' is missing the following properties from type 'i1': p, p3, p6
+!!! error TS2735: Type 'Object' is missing the following properties from type 'i1': p, p3, p6
     var obj3: i1 = new obj0;
                    ~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     var obj4: i1 = new Base;
         ~~~~
-!!! error TS2322: Type 'Base' is not assignable to type 'i1'.
-!!! error TS2322:   Type 'Base' is missing the following properties from type 'i1': p, p3, p6
+!!! error TS2735: Type 'Base' is missing the following properties from type 'i1': p, p3, p6
     var obj5: i1 = null;
     var obj6: i1 = function () { };
         ~~~~
-!!! error TS2322: Type '() => void' is not assignable to type 'i1'.
-!!! error TS2322:   Type '() => void' is missing the following properties from type 'i1': p, p3, p6
+!!! error TS2735: Type '() => void' is missing the following properties from type 'i1': p, p3, p6
     //var obj7: i1 = function foo() { };
     var obj8: i1 = <i1> anyVar;
     var obj9: i1 = new <i1> anyVar;
@@ -324,25 +311,20 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
     var obj44: i5;
     var obj45: i5 = {};
         ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'i5'.
-!!! error TS2322:   Type '{}' is missing the following properties from type 'i5': p, p3, p6
+!!! error TS2735: Type '{}' is missing the following properties from type 'i5': p, p3, p6
     var obj46: i5 = new Object();
         ~~~~~
-!!! error TS2322: Type 'Object' is not assignable to type 'i5'.
-!!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
-!!! error TS2322:     Type 'Object' is missing the following properties from type 'i5': p, p3, p6
+!!! error TS2735: Type 'Object' is missing the following properties from type 'i5': p, p3, p6
     var obj47: i5 = new obj44;
                     ~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     var obj48: i5 = new Base;
         ~~~~~
-!!! error TS2322: Type 'Base' is not assignable to type 'i5'.
-!!! error TS2322:   Type 'Base' is missing the following properties from type 'i5': p, p3, p6
+!!! error TS2735: Type 'Base' is missing the following properties from type 'i5': p, p3, p6
     var obj49: i5 = null;
     var obj50: i5 = function () { };
         ~~~~~
-!!! error TS2322: Type '() => void' is not assignable to type 'i5'.
-!!! error TS2322:   Type '() => void' is missing the following properties from type 'i5': p, p3, p6
+!!! error TS2735: Type '() => void' is missing the following properties from type 'i5': p, p3, p6
     //var obj51: i5 = function foo() { };
     var obj52: i5 = <i5> anyVar;
     var obj53: i5 = new <i5> anyVar;
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
index b5d6baa1d2d93..1cef57253dd2e 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
@@ -1,9 +1,6 @@
-tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(21,1): error TS2322: Type 'C' is not assignable to type 'I'.
-  Property 'other' is missing in type 'C' but present in type 'I'.
-tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(24,1): error TS2322: Type 'I' is not assignable to type 'D'.
-  Property 'bar' is missing in type 'I' but present in type 'D'.
-tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2322: Type 'C' is not assignable to type 'D'.
-  Type 'C' is missing the following properties from type 'D': other, bar
+tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(21,1): error TS2737: Property 'other' is missing in type 'C' but present in type 'I'.
+tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(24,1): error TS2737: Property 'bar' is missing in type 'I' but present in type 'D'.
+tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2735: Type 'C' is missing the following properties from type 'D': other, bar
 
 
 ==== tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts (3 errors) ====
@@ -29,17 +26,14 @@ tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2322: T
     c = i;
     i = c; // error
     ~
-!!! error TS2322: Type 'C' is not assignable to type 'I'.
-!!! error TS2322:   Property 'other' is missing in type 'C' but present in type 'I'.
+!!! error TS2737: Property 'other' is missing in type 'C' but present in type 'I'.
     
     i = d;
     d = i; // error
     ~
-!!! error TS2322: Type 'I' is not assignable to type 'D'.
-!!! error TS2322:   Property 'bar' is missing in type 'I' but present in type 'D'.
+!!! error TS2737: Property 'bar' is missing in type 'I' but present in type 'D'.
     
     c = d;
     d = c; // error
     ~
-!!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Type 'C' is missing the following properties from type 'D': other, bar
\ No newline at end of file
+!!! error TS2735: Type 'C' is missing the following properties from type 'D': other, bar
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceInheritance.errors.txt b/tests/baselines/reference/interfaceInheritance.errors.txt
index 2b92c3561dfdd..98af65ecc3762 100644
--- a/tests/baselines/reference/interfaceInheritance.errors.txt
+++ b/tests/baselines/reference/interfaceInheritance.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/interfaceInheritance.ts(22,7): error TS2420: Class 'C1' incorrectly implements interface 'I2'.
   Type 'C1' is missing the following properties from type 'I2': i1P1, i1P2
-tests/cases/compiler/interfaceInheritance.ts(30,1): error TS2322: Type 'I3' is not assignable to type 'I2'.
-  Type 'I3' is missing the following properties from type 'I2': i1P1, i1P2
+tests/cases/compiler/interfaceInheritance.ts(30,1): error TS2735: Type 'I3' is missing the following properties from type 'I2': i1P1, i1P2
 tests/cases/compiler/interfaceInheritance.ts(37,1): error TS2322: Type 'I5' is not assignable to type 'I4'.
   Types of property 'one' are incompatible.
     Type 'string' is not assignable to type 'number'.
@@ -45,8 +44,7 @@ tests/cases/compiler/interfaceInheritance.ts(38,1): error TS2322: Type 'I4' is n
     i1 = i2;
     i2 = i3; // should be an error - i3 does not implement the members of i1
     ~~
-!!! error TS2322: Type 'I3' is not assignable to type 'I2'.
-!!! error TS2322:   Type 'I3' is missing the following properties from type 'I2': i1P1, i1P2
+!!! error TS2735: Type 'I3' is missing the following properties from type 'I2': i1P1, i1P2
     
     var c1: C1;
     
diff --git a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
index 1c2f23cdb1f82..dfb62751ce534 100644
--- a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
+++ b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
@@ -1,35 +1,27 @@
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(19,1): error TS2322: Type 'A' is not assignable to type 'A & B'.
-  Type 'A' is not assignable to type 'B'.
-    Property 'b' is missing in type 'A' but present in type 'B'.
+  Property 'b' is missing in type 'A' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(20,1): error TS2322: Type 'B' is not assignable to type 'A & B'.
-  Type 'B' is not assignable to type 'A'.
-    Property 'a' is missing in type 'B' but present in type 'A'.
+  Property 'a' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(23,1): error TS2322: Type 'A | B' is not assignable to type '(A & B) | (C & D)'.
   Type 'A' is not assignable to type '(A & B) | (C & D)'.
     Type 'A' is not assignable to type 'C & D'.
-      Type 'A' is not assignable to type 'C'.
-        Property 'c' is missing in type 'A' but present in type 'C'.
+      Property 'c' is missing in type 'A' but present in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(25,1): error TS2322: Type 'C | D' is not assignable to type '(A & B) | (C & D)'.
   Type 'C' is not assignable to type '(A & B) | (C & D)'.
     Type 'C' is not assignable to type 'C & D'.
-      Type 'C' is not assignable to type 'D'.
-        Property 'd' is missing in type 'C' but present in type 'D'.
+      Property 'd' is missing in type 'C' but present in type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(26,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
   Type 'C & D' is not assignable to type 'A & B'.
-    Type 'C & D' is not assignable to type 'A'.
-      Property 'a' is missing in type 'C & D' but present in type 'A'.
+    Property 'a' is missing in type 'C & D' but present in type 'A'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(27,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
   Type 'C & D' is not assignable to type 'A | B'.
-    Type 'C & D' is not assignable to type 'B'.
-      Property 'b' is missing in type 'C & D' but present in type 'B'.
+    Property 'b' is missing in type 'C & D' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(28,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
   Type 'A & B' is not assignable to type 'C & D'.
-    Type 'A & B' is not assignable to type 'C'.
-      Property 'c' is missing in type 'A & B' but present in type 'C'.
+    Property 'c' is missing in type 'A & B' but present in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(29,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
   Type 'A & B' is not assignable to type 'C | D'.
-    Type 'A & B' is not assignable to type 'D'.
-      Property 'd' is missing in type 'A & B' but present in type 'D'.
+    Property 'd' is missing in type 'A & B' but present in type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(31,1): error TS2322: Type 'A & B' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
   Type 'A & B' is not assignable to type 'B & D'.
     Type 'A & B' is not assignable to type 'D'.
@@ -43,16 +35,13 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(33,1): e
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(34,1): error TS2322: Type 'C | D' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
     Type 'C' is not assignable to type 'B & D'.
-      Type 'C' is not assignable to type 'B'.
-        Property 'b' is missing in type 'C' but present in type 'B'.
+      Property 'b' is missing in type 'C' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(35,1): error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
   Type 'A & C' is not assignable to type 'A & B'.
-    Type 'A & C' is not assignable to type 'B'.
-      Property 'b' is missing in type 'A & C' but present in type 'B'.
+    Property 'b' is missing in type 'A & C' but present in type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
   Type 'A & C' is not assignable to type 'C & D'.
-    Type 'A & C' is not assignable to type 'D'.
-      Property 'd' is missing in type 'A & C' but present in type 'D'.
+    Property 'd' is missing in type 'A & C' but present in type 'D'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts (14 errors) ====
@@ -77,13 +66,11 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
     anb = a;
     ~~~
 !!! error TS2322: Type 'A' is not assignable to type 'A & B'.
-!!! error TS2322:   Type 'A' is not assignable to type 'B'.
-!!! error TS2322:     Property 'b' is missing in type 'A' but present in type 'B'.
+!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
     anb = b;
     ~~~
 !!! error TS2322: Type 'B' is not assignable to type 'A & B'.
-!!! error TS2322:   Type 'B' is not assignable to type 'A'.
-!!! error TS2322:     Property 'a' is missing in type 'B' but present in type 'A'.
+!!! error TS2322:   Property 'a' is missing in type 'B' but present in type 'A'.
     
     x = anb;  // Ok
     x = aob;
@@ -91,40 +78,34 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322: Type 'A | B' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:   Type 'A' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'A' is not assignable to type 'C & D'.
-!!! error TS2322:       Type 'A' is not assignable to type 'C'.
-!!! error TS2322:         Property 'c' is missing in type 'A' but present in type 'C'.
+!!! error TS2322:       Property 'c' is missing in type 'A' but present in type 'C'.
     x = cnd;  // Ok
     x = cod;
     ~
 !!! error TS2322: Type 'C | D' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:   Type 'C' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'C & D'.
-!!! error TS2322:       Type 'C' is not assignable to type 'D'.
-!!! error TS2322:         Property 'd' is missing in type 'C' but present in type 'D'.
+!!! error TS2322:       Property 'd' is missing in type 'C' but present in type 'D'.
     anb = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A & B'.
-!!! error TS2322:     Type 'C & D' is not assignable to type 'A'.
-!!! error TS2322:       Property 'a' is missing in type 'C & D' but present in type 'A'.
+!!! error TS2322:     Property 'a' is missing in type 'C & D' but present in type 'A'.
     aob = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A | B'.
-!!! error TS2322:     Type 'C & D' is not assignable to type 'B'.
-!!! error TS2322:       Property 'b' is missing in type 'C & D' but present in type 'B'.
+!!! error TS2322:     Property 'b' is missing in type 'C & D' but present in type 'B'.
     cnd = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C & D'.
-!!! error TS2322:     Type 'A & B' is not assignable to type 'C'.
-!!! error TS2322:       Property 'c' is missing in type 'A & B' but present in type 'C'.
+!!! error TS2322:     Property 'c' is missing in type 'A & B' but present in type 'C'.
     cod = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C | D'.
-!!! error TS2322:     Type 'A & B' is not assignable to type 'D'.
-!!! error TS2322:       Property 'd' is missing in type 'A & B' but present in type 'D'.
+!!! error TS2322:     Property 'd' is missing in type 'A & B' but present in type 'D'.
     
     y = anb;
     ~
@@ -147,20 +128,17 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322: Type 'C | D' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
 !!! error TS2322:   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'B & D'.
-!!! error TS2322:       Type 'C' is not assignable to type 'B'.
-!!! error TS2322:         Property 'b' is missing in type 'C' but present in type 'B'.
+!!! error TS2322:       Property 'b' is missing in type 'C' but present in type 'B'.
     anb = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'A & B'.
-!!! error TS2322:     Type 'A & C' is not assignable to type 'B'.
-!!! error TS2322:       Property 'b' is missing in type 'A & C' but present in type 'B'.
+!!! error TS2322:     Property 'b' is missing in type 'A & C' but present in type 'B'.
     aob = y;  // Ok
     cnd = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'C & D'.
-!!! error TS2322:     Type 'A & C' is not assignable to type 'D'.
-!!! error TS2322:       Property 'd' is missing in type 'A & C' but present in type 'D'.
+!!! error TS2322:     Property 'd' is missing in type 'A & C' but present in type 'D'.
     cod = y;  // Ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt b/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt
index 34736d7f679f2..e32b6aa3d63da 100644
--- a/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt
+++ b/tests/baselines/reference/intersectionAsWeakTypeSource.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(8,7): error TS2559: Type 'XY' has no properties in common with type 'Z'.
-tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(18,7): error TS2322: Type 'Brand<{ view: number; styleMedia: string; }>' is not assignable to type 'ViewStyle'.
-  Type 'Number & { __brand: { view: number; styleMedia: string; }; }' is missing the following properties from type 'ViewStyle': view, styleMedia
+tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(18,7): error TS2735: Type 'Number & { __brand: { view: number; styleMedia: string; }; }' is missing the following properties from type 'ViewStyle': view, styleMedia
 
 
 ==== tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts (2 errors) ====
@@ -25,6 +24,5 @@ tests/cases/conformance/types/intersection/intersectionAsWeakTypeSource.ts(18,7)
     const wrapped = create({ first: { view: 0, styleMedia: "???" } });
     const vs: ViewStyle = wrapped.first // error, first is a branded number
           ~~
-!!! error TS2322: Type 'Brand<{ view: number; styleMedia: string; }>' is not assignable to type 'ViewStyle'.
-!!! error TS2322:   Type 'Number & { __brand: { view: number; styleMedia: string; }; }' is missing the following properties from type 'ViewStyle': view, styleMedia
+!!! error TS2735: Type 'Number & { __brand: { view: number; styleMedia: string; }; }' is missing the following properties from type 'ViewStyle': view, styleMedia
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionTypeAssignment.errors.txt b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
index bfc0fe842c31d..a9344bb889bb5 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.errors.txt
+++ b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
@@ -1,13 +1,9 @@
-tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(8,1): error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; b: string; }'.
-  Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
+tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(8,1): error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(9,1): error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
-  Type '{ a: string; }' is not assignable to type '{ b: string; }'.
-    Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
-tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(13,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; b: string; }'.
-  Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
+  Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
+tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(13,1): error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
-  Type '{ b: string; }' is not assignable to type '{ a: string; }'.
-    Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
+  Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts (4 errors) ====
@@ -20,25 +16,21 @@ tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1):
     a = y;
     x = a;  // Error
     ~
-!!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; b: string; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
     y = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
-!!! error TS2322:   Type '{ a: string; }' is not assignable to type '{ b: string; }'.
-!!! error TS2322:     Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
     
     b = x;
     b = y;
     x = b;  // Error
     ~
-!!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; b: string; }'.
-!!! error TS2322:   Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
+!!! error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
     y = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
-!!! error TS2322:   Type '{ b: string; }' is not assignable to type '{ a: string; }'.
-!!! error TS2322:     Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
+!!! error TS2322:   Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
     
     x = y;
     y = x;
diff --git a/tests/baselines/reference/invalidReturnStatements.errors.txt b/tests/baselines/reference/invalidReturnStatements.errors.txt
index be929ce558448..6627842d0314b 100644
--- a/tests/baselines/reference/invalidReturnStatements.errors.txt
+++ b/tests/baselines/reference/invalidReturnStatements.errors.txt
@@ -2,10 +2,8 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(2
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(4,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(5,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,22): error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
-  Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
-tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,22): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'name' is missing in type 'C' but present in type 'D'.
+tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,22): error TS2735: Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
+tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,22): error TS2737: Property 'name' is missing in type 'C' but present in type 'D'.
 
 
 ==== tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts (6 errors) ====
@@ -34,12 +32,10 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(1
     }
     function fn10(): D { return { id: 12 }; } 
                          ~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
-!!! error TS2322:   Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
+!!! error TS2735: Type '{ id: number; }' is missing the following properties from type 'D': name, dispose
     
     function fn11(): D { return new C(); }
                          ~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'name' is missing in type 'C' but present in type 'D'.
+!!! error TS2737: Property 'name' is missing in type 'C' but present in type 'D'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern7.errors.txt b/tests/baselines/reference/iterableArrayPattern7.errors.txt
index 6fa83f22d669b..2b6a1c4bb076d 100644
--- a/tests/baselines/reference/iterableArrayPattern7.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern7.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts(17,5): error TS2322: Type 'Foo' is not assignable to type 'string[]'.
-  Type 'Foo' is missing the following properties from type 'string[]': length, pop, push, concat, and 25 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts(17,5): error TS2736: Type 'Foo' is missing the following properties from type 'string[]': length, pop, push, concat, and 25 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts (1 errors) ====
@@ -21,5 +20,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts(17,5): error
     var a: Bar, b: string[];
     [a, b] = new FooIterator;
         ~
-!!! error TS2322: Type 'Foo' is not assignable to type 'string[]'.
-!!! error TS2322:   Type 'Foo' is missing the following properties from type 'string[]': length, pop, push, concat, and 25 more.
\ No newline at end of file
+!!! error TS2736: Type 'Foo' is missing the following properties from type 'string[]': length, pop, push, concat, and 25 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
index 470ee4cfb6da2..a1ed5747949f5 100644
--- a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
@@ -4,8 +4,7 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
       Type 'SymbolIterator' is not assignable to type 'Iterator<symbol>'.
         Types of property 'next' are incompatible.
           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
-            Type '{ value: symbol; }' is not assignable to type 'IteratorResult<symbol>'.
-              Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
+            Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
 
 
 ==== tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts (1 errors) ====
@@ -29,5 +28,4 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
 !!! error TS2322:       Type 'SymbolIterator' is not assignable to type 'Iterator<symbol>'.
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
-!!! error TS2322:             Type '{ value: symbol; }' is not assignable to type 'IteratorResult<symbol>'.
-!!! error TS2322:               Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
\ No newline at end of file
+!!! error TS2322:             Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt b/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt
index a33393fc81825..1ac8114774ae7 100644
--- a/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt
+++ b/tests/baselines/reference/jsContainerMergeTsDeclaration3.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/salsa/b.js(1,7): error TS2322: Type '{}' is not assignable to type 'typeof A'.
-  Type '{}' is missing the following properties from type 'typeof A': prototype, d
+tests/cases/conformance/salsa/b.js(1,7): error TS2735: Type '{}' is missing the following properties from type 'typeof A': prototype, d
 
 
 ==== tests/cases/conformance/salsa/a.d.ts (0 errors) ====
@@ -7,7 +6,6 @@ tests/cases/conformance/salsa/b.js(1,7): error TS2322: Type '{}' is not assignab
 ==== tests/cases/conformance/salsa/b.js (1 errors) ====
     const A = { };
           ~
-!!! error TS2322: Type '{}' is not assignable to type 'typeof A'.
-!!! error TS2322:   Type '{}' is missing the following properties from type 'typeof A': prototype, d
+!!! error TS2735: Type '{}' is missing the following properties from type 'typeof A': prototype, d
     A.d = { };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypes6.errors.txt b/tests/baselines/reference/mappedTypes6.errors.txt
index 58e763cbcf90b..37388585a291a 100644
--- a/tests/baselines/reference/mappedTypes6.errors.txt
+++ b/tests/baselines/reference/mappedTypes6.errors.txt
@@ -11,14 +11,10 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(47,5): error TS2322: Type '
 tests/cases/conformance/types/mapped/mappedTypes6.ts(56,5): error TS2322: Type '{}' is not assignable to type 'Denullified<T>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(57,5): error TS2322: Type '{}' is not assignable to type 'Required<T>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(58,5): error TS2322: Type '{}' is not assignable to type 'T'.
-tests/cases/conformance/types/mapped/mappedTypes6.ts(92,1): error TS2322: Type '{ a: number; }' is not assignable to type 'Foo'.
-  Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
-tests/cases/conformance/types/mapped/mappedTypes6.ts(104,1): error TS2322: Type '{ a: number; }' is not assignable to type 'Required<Foo>'.
-  Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
-tests/cases/conformance/types/mapped/mappedTypes6.ts(105,1): error TS2322: Type '{ a: number; b: number; }' is not assignable to type 'Required<Foo>'.
-  Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
-tests/cases/conformance/types/mapped/mappedTypes6.ts(106,1): error TS2322: Type '{ a: number; b: number; c: number; }' is not assignable to type 'Required<Foo>'.
-  Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
+tests/cases/conformance/types/mapped/mappedTypes6.ts(92,1): error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
+tests/cases/conformance/types/mapped/mappedTypes6.ts(104,1): error TS2735: Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
+tests/cases/conformance/types/mapped/mappedTypes6.ts(105,1): error TS2735: Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
+tests/cases/conformance/types/mapped/mappedTypes6.ts(106,1): error TS2737: Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(116,4): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(119,4): error TS2540: Cannot assign to 'a' because it is a constant or a read-only property.
 tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
@@ -143,8 +139,7 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     
     x1 = { a: 1 };  // Error
     ~~
-!!! error TS2322: Type '{ a: number; }' is not assignable to type 'Foo'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
+!!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
     x1 = { a: 1, b: 1 };
     x1 = { a: 1, b: 1, c: 1 };
     x1 = { a: 1, b: 1, c: 1, d: 1 };
@@ -158,16 +153,13 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     
     x2 = { a: 1 };  // Error
     ~~
-!!! error TS2322: Type '{ a: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
+!!! error TS2735: Type '{ a: number; }' is missing the following properties from type 'Required<Foo>': b, c, d
     x2 = { a: 1, b: 1 };  // Error
     ~~
-!!! error TS2322: Type '{ a: number; b: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
+!!! error TS2735: Type '{ a: number; b: number; }' is missing the following properties from type 'Required<Foo>': c, d
     x2 = { a: 1, b: 1, c: 1 };  // Error
     ~~
-!!! error TS2322: Type '{ a: number; b: number; c: number; }' is not assignable to type 'Required<Foo>'.
-!!! error TS2322:   Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
+!!! error TS2737: Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
     x2 = { a: 1, b: 1, c: 1, d: 1 };
     
     type Bar = {
diff --git a/tests/baselines/reference/nonIterableRestElement3.errors.txt b/tests/baselines/reference/nonIterableRestElement3.errors.txt
index 275aa0cb3ced3..d1ec23b4a24a4 100644
--- a/tests/baselines/reference/nonIterableRestElement3.errors.txt
+++ b/tests/baselines/reference/nonIterableRestElement3.errors.txt
@@ -1,10 +1,8 @@
-tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error TS2322: Type '(string | number)[]' is not assignable to type '{ bogus: number; }'.
-  Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
+tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error TS2737: Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
 
 
 ==== tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts (1 errors) ====
     var c = { bogus: 0 };
     [...c] = ["", 0];
         ~
-!!! error TS2322: Type '(string | number)[]' is not assignable to type '{ bogus: number; }'.
-!!! error TS2322:   Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
\ No newline at end of file
+!!! error TS2737: Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
index 22d7aa657274f..c4a9e5f73e434 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-  Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
+tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2737: Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'number' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(14,1): error TS2322: Type 'true' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'string' is not assignable to type 'object'.
@@ -15,8 +14,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): err
     x = a;
     y = a; // expect error
     ~
-!!! error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-!!! error TS2322:   Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
+!!! error TS2737: Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
     a = x;
     a = y;
     
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
index a6f0b5a9bdd32..3a6ce5f2e7161 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/objectLiteralIndexerErrors.ts(13,54): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'y' is missing in type 'A' but present in type 'B'.
+tests/cases/compiler/objectLiteralIndexerErrors.ts(13,54): error TS2737: Property 'y' is missing in type 'A' but present in type 'B'.
 tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A' is not assignable to type 'B'.
 
 
@@ -18,8 +17,7 @@ tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A
     
     var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
                                                          ~
-!!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'y' is missing in type 'A' but present in type 'B'.
+!!! error TS2737: Property 'y' is missing in type 'A' but present in type 'B'.
 !!! related TS6501 tests/cases/compiler/objectLiteralIndexerErrors.ts:13:26: The expected type comes from this index signature.
     o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
                  ~
diff --git a/tests/baselines/reference/objectLiteralNormalization.errors.txt b/tests/baselines/reference/objectLiteralNormalization.errors.txt
index 52af1563231c7..200a715661460 100644
--- a/tests/baselines/reference/objectLiteralNormalization.errors.txt
+++ b/tests/baselines/reference/objectLiteralNormalization.errors.txt
@@ -1,17 +1,14 @@
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(7,14): error TS2322: Type 'number' is not assignable to type 'string | undefined'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(8,1): error TS2322: Type '{ b: string; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
-  Type '{ b: string; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-    Type '{ b: string; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, c
+  Type '{ b: string; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, c
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(9,1): error TS2322: Type '{ c: true; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
-  Type '{ c: true; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-    Type '{ c: true; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, b
+  Type '{ c: true; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, b
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(17,1): error TS2322: Type '{ a: string; b: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
   Type '{ a: string; b: number; }' is not assignable to type '{ a?: undefined; b?: undefined; }'.
     Types of property 'a' are incompatible.
       Type 'string' is not assignable to type 'undefined'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(18,1): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
-  Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
-    Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
+  Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
 
 
 ==== tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts (5 errors) ====
@@ -28,13 +25,11 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
     a1 = { b: "y" };  // Error
     ~~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
-!!! error TS2322:   Type '{ b: string; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-!!! error TS2322:     Type '{ b: string; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, c
+!!! error TS2322:   Type '{ b: string; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, c
     a1 = { c: true };  // Error
     ~~
 !!! error TS2322: Type '{ c: true; }' is not assignable to type '{ a: number; b?: undefined; c?: undefined; } | { a: number; b: string; c?: undefined; } | { a: number; b: string; c: boolean; }'.
-!!! error TS2322:   Type '{ c: true; }' is not assignable to type '{ a: number; b: string; c: boolean; }'.
-!!! error TS2322:     Type '{ c: true; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, b
+!!! error TS2322:   Type '{ c: true; }' is missing the following properties from type '{ a: number; b: string; c: boolean; }': a, b
     
     let a2 = [{ a: 1, b: 2 }, { a: "abc" }, {}][0];
     a2.a;  // string | number | undefined
@@ -51,8 +46,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
     a2 = { a: 1 };  // Error
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
-!!! error TS2322:   Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:     Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
     
     // Object literals containing spreads are not normalized
     declare let b1: { a: string, b: string } | { b: string, c: string };
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index bea86d96b08f0..44026352cf945 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -1,10 +1,8 @@
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(13,21): error TS2339: Property 'x' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(16,5): error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
   Property 'sn' is optional in type '{ sn?: string | number; }' but required in type '{ sn: string | number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(23,1): error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(23,1): error TS2737: Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2737: Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,19): error TS2698: Spread types may only be created from object types.
@@ -48,13 +46,11 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,11): error TS233
     let spread = { ...{ b: true }, ...{s: "foo" } };
     spread = { s: "foo" };  // error, missing 'b'
     ~~~~~~
-!!! error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
+!!! error TS2737: Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
     let b = { b: false };
     spread = b; // error, missing 's'
     ~~~~~~
-!!! error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
+!!! error TS2737: Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
     
     // literal repeats are not allowed, but spread repeats are fine
     let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
diff --git a/tests/baselines/reference/optionalPropertiesTest.errors.txt b/tests/baselines/reference/optionalPropertiesTest.errors.txt
index c4615d63284ab..0e6a2e3de6fa3 100644
--- a/tests/baselines/reference/optionalPropertiesTest.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesTest.errors.txt
@@ -1,9 +1,6 @@
-tests/cases/compiler/optionalPropertiesTest.ts(14,1): error TS2322: Type '{ name: string; }' is not assignable to type 'IFoo'.
-  Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
-tests/cases/compiler/optionalPropertiesTest.ts(25,5): error TS2322: Type '{}' is not assignable to type 'i1'.
-  Property 'M' is missing in type '{}' but present in type 'i1'.
-tests/cases/compiler/optionalPropertiesTest.ts(26,5): error TS2322: Type '{}' is not assignable to type 'i3'.
-  Property 'M' is missing in type '{}' but present in type 'i3'.
+tests/cases/compiler/optionalPropertiesTest.ts(14,1): error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
+tests/cases/compiler/optionalPropertiesTest.ts(25,5): error TS2737: Property 'M' is missing in type '{}' but present in type 'i1'.
+tests/cases/compiler/optionalPropertiesTest.ts(26,5): error TS2737: Property 'M' is missing in type '{}' but present in type 'i3'.
 tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is not assignable to type 'i1'.
   Property 'M' is optional in type 'i2' but required in type 'i1'.
 
@@ -24,8 +21,7 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     foo = { id: 1234, name: "test" };  // Ok
     foo = { name: "test" };            // Error, id missing
     ~~~
-!!! error TS2322: Type '{ name: string; }' is not assignable to type 'IFoo'.
-!!! error TS2322:   Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
+!!! error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
     foo = {id: 1234, print:()=>{}}	   // Ok
     
     var s = foo.name || "default";
@@ -38,12 +34,10 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     
     var test1: i1 = {};
         ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'i1'.
-!!! error TS2322:   Property 'M' is missing in type '{}' but present in type 'i1'.
+!!! error TS2737: Property 'M' is missing in type '{}' but present in type 'i1'.
     var test2: i3 = {};
         ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'i3'.
-!!! error TS2322:   Property 'M' is missing in type '{}' but present in type 'i3'.
+!!! error TS2737: Property 'M' is missing in type '{}' but present in type 'i3'.
     var test3: i2 = {};
     var test4: i4 = {};
     var test5: i1 = { M: function () { } };
diff --git a/tests/baselines/reference/overloadingOnConstants1.errors.txt b/tests/baselines/reference/overloadingOnConstants1.errors.txt
index ed4582b547747..e1481a478b79e 100644
--- a/tests/baselines/reference/overloadingOnConstants1.errors.txt
+++ b/tests/baselines/reference/overloadingOnConstants1.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/compiler/overloadingOnConstants1.ts(22,5): error TS2322: Type 'Base' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
-tests/cases/compiler/overloadingOnConstants1.ts(23,5): error TS2322: Type 'Derived1' is not assignable to type 'Derived3'.
-  Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
-tests/cases/compiler/overloadingOnConstants1.ts(24,5): error TS2322: Type 'Derived2' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
-tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2322: Type 'Derived3' is not assignable to type 'Derived1'.
-  Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
+tests/cases/compiler/overloadingOnConstants1.ts(22,5): error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
+tests/cases/compiler/overloadingOnConstants1.ts(23,5): error TS2737: Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
+tests/cases/compiler/overloadingOnConstants1.ts(24,5): error TS2737: Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
+tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2737: Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
 
 
 ==== tests/cases/compiler/overloadingOnConstants1.ts (4 errors) ====
@@ -32,17 +28,13 @@ tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2322: Type 'Deriv
     // these are errors
     var htmlElement2: Derived1 = d2.createElement("yo")
         ~~~~~~~~~~~~
-!!! error TS2322: Type 'Base' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
+!!! error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
     var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
         ~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'Derived1' is not assignable to type 'Derived3'.
-!!! error TS2322:   Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
+!!! error TS2737: Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
     var htmlDivElement2: Derived1 = d2.createElement("div");
         ~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'Derived2' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
+!!! error TS2737: Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
     var htmlSpanElement2: Derived1 = d2.createElement("span");
         ~~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'Derived3' is not assignable to type 'Derived1'.
-!!! error TS2322:   Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
\ No newline at end of file
+!!! error TS2737: Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
index 10d9bdf0d9fe3..ebb9d89220b11 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -1,8 +1,6 @@
-tests/cases/compiler/overloadsWithProvisionalErrors.ts(6,11): error TS2322: Type '{}' is not assignable to type '{ a: number; b: number; }'.
-  Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
+tests/cases/compiler/overloadsWithProvisionalErrors.ts(6,11): error TS2735: Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(7,17): error TS2304: Cannot find name 'blah'.
-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; }' but present in type '{ a: number; b: number; }'.
+tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,11): error TS2737: Property 'b' is missing in type '{ a: any; }' but present in type '{ a: number; b: number; }'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'.
 
 
@@ -14,16 +12,14 @@ 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 TS2322: Type '{}' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:   Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
+!!! error TS2735: Type '{}' is missing the following properties from type '{ a: number; b: number; }': a, b
 !!! 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 TS2322: Type '{ a: any; }' is not assignable to type '{ a: number; b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: any; }' but present in type '{ a: number; b: number; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: any; }' but present in type '{ a: number; b: number; }'.
 !!! 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/promisesWithConstraints.errors.txt b/tests/baselines/reference/promisesWithConstraints.errors.txt
index 30e65cf2762e7..3c68f0f700677 100644
--- a/tests/baselines/reference/promisesWithConstraints.errors.txt
+++ b/tests/baselines/reference/promisesWithConstraints.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/compiler/promisesWithConstraints.ts(15,1): error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
-  Type 'Foo' is not assignable to type 'Bar'.
-    Property 'y' is missing in type 'Foo' but present in type 'Bar'.
+  Property 'y' is missing in type 'Foo' but present in type 'Bar'.
 tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CPromise<Foo>' is not assignable to type 'CPromise<Bar>'.
   Type 'Foo' is not assignable to type 'Bar'.
 
@@ -23,8 +22,7 @@ tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CProm
     b = a; // ok
     ~
 !!! error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
-!!! error TS2322:   Type 'Foo' is not assignable to type 'Bar'.
-!!! error TS2322:     Property 'y' is missing in type 'Foo' but present in type 'Bar'.
+!!! error TS2322:   Property 'y' is missing in type 'Foo' but present in type 'Bar'.
     
     var a2: CPromise<Foo>;
     var b2: CPromise<Bar>;
diff --git a/tests/baselines/reference/qualify.errors.txt b/tests/baselines/reference/qualify.errors.txt
index 7b2c1f0f04a1a..a95fea6e62205 100644
--- a/tests/baselines/reference/qualify.errors.txt
+++ b/tests/baselines/reference/qualify.errors.txt
@@ -1,17 +1,13 @@
 tests/cases/compiler/qualify.ts(21,13): error TS2322: Type '3' is not assignable to type 'I'.
 tests/cases/compiler/qualify.ts(30,13): error TS2322: Type '3' is not assignable to type 'I2'.
-tests/cases/compiler/qualify.ts(45,13): error TS2322: Type 'I4' is not assignable to type 'I3'.
-  Property 'zeep' is missing in type 'I4' but present in type 'I3'.
-tests/cases/compiler/qualify.ts(46,13): error TS2322: Type 'I4' is not assignable to type 'I3[]'.
-  Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/qualify.ts(45,13): error TS2737: Property 'zeep' is missing in type 'I4' but present in type 'I3'.
+tests/cases/compiler/qualify.ts(46,13): error TS2736: Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
 tests/cases/compiler/qualify.ts(47,13): error TS2322: Type 'I4' is not assignable to type '() => I3'.
   Type 'I4' provides no match for the signature '(): I3'.
 tests/cases/compiler/qualify.ts(48,13): error TS2322: Type 'I4' is not assignable to type '(k: I3) => void'.
   Type 'I4' provides no match for the signature '(k: I3): void'.
-tests/cases/compiler/qualify.ts(49,13): error TS2322: Type 'I4' is not assignable to type '{ k: I3; }'.
-  Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
-tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable to type 'T.I'.
-  Property 'p' is missing in type 'I' but present in type 'I'.
+tests/cases/compiler/qualify.ts(49,13): error TS2737: Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
+tests/cases/compiler/qualify.ts(58,5): error TS2737: Property 'p' is missing in type 'I' but present in type 'I'.
 
 
 ==== tests/cases/compiler/qualify.ts (8 errors) ====
@@ -65,12 +61,10 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
             var v1:I4;
             var v2:K1.I3=v1;
                 ~~
-!!! error TS2322: Type 'I4' is not assignable to type 'I3'.
-!!! error TS2322:   Property 'zeep' is missing in type 'I4' but present in type 'I3'.
+!!! error TS2737: Property 'zeep' is missing in type 'I4' but present in type 'I3'.
             var v3:K1.I3[]=v1;
                 ~~
-!!! error TS2322: Type 'I4' is not assignable to type 'I3[]'.
-!!! error TS2322:   Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
+!!! error TS2736: Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
             var v4:()=>K1.I3=v1;
                 ~~
 !!! error TS2322: Type 'I4' is not assignable to type '() => I3'.
@@ -81,8 +75,7 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
 !!! error TS2322:   Type 'I4' provides no match for the signature '(k: I3): void'.
             var v6:{k:K1.I3;}=v1;
                 ~~
-!!! error TS2322: Type 'I4' is not assignable to type '{ k: I3; }'.
-!!! error TS2322:   Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
+!!! error TS2737: Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
         }
     }
     
@@ -93,7 +86,6 @@ tests/cases/compiler/qualify.ts(58,5): error TS2322: Type 'I' is not assignable
     var y:I;
     var x:T.I=y;
         ~
-!!! error TS2322: Type 'I' is not assignable to type 'T.I'.
-!!! error TS2322:   Property 'p' is missing in type 'I' but present in type 'I'.
+!!! error TS2737: Property 'p' is missing in type 'I' but present in type 'I'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
index 9d402a7fbd3b5..633f09af26d63 100644
--- a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1): error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
-  Type 'LinkedList<Entity>' is not assignable to type 'Product'.
-    Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
+  Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
 
 
 ==== tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts (1 errors) ====
@@ -25,6 +24,5 @@ tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1):
     productList = entityList;  // Error
     ~~~~~~~~~~~
 !!! error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
-!!! error TS2322:   Type 'LinkedList<Entity>' is not assignable to type 'Product'.
-!!! error TS2322:     Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
+!!! error TS2322:   Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
index 1d02c76fc1cb3..0ac7d00253aeb 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
@@ -1,9 +1,7 @@
 /user.js(2,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
-/user.js(5,7): error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
-  Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
+/user.js(5,7): error TS2737: Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
 /user.js(9,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
-/user.js(12,7): error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
-  Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
+/user.js(12,7): error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
 
 
 ==== /user.js (4 errors) ====
@@ -15,8 +13,7 @@
     /** @type {{ b: number }} */
     const json1 = require("./json.json"); // No error (bad)
           ~~~~~
-!!! error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
+!!! error TS2737: Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
     json1.b; // No error (OK since that's the type annotation)
     
     const js0 = require("./js.js");
@@ -27,8 +24,7 @@
     /** @type {{ b: number }} */
     const js1 = require("./js.js"); // Error (good)
           ~~~
-!!! error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
-!!! error TS2322:   Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
     js1.b;
 ==== /json.json (0 errors) ====
     { "a": 0 }
diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
index a79057e085e35..a308bf6b31c19 100644
--- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
+++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
@@ -1,11 +1,7 @@
-tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(12,1): error TS2322: Type 'C' is not assignable to type 'A'.
-  Property 'prop' is missing in type 'C' but present in type 'A'.
-tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(13,5): error TS2322: Type 'typeof B' is not assignable to type 'A'.
-  Property 'prop' is missing in type 'typeof B' but present in type 'A'.
-tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(16,5): error TS2322: Type 'C' is not assignable to type 'B'.
-  Property 'prop' is missing in type 'C' but present in type 'B'.
-tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(17,5): error TS2322: Type 'typeof B' is not assignable to type 'B'.
-  Property 'prop' is missing in type 'typeof B' but present in type 'B'.
+tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(12,1): error TS2737: Property 'prop' is missing in type 'C' but present in type 'A'.
+tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(13,5): error TS2737: Property 'prop' is missing in type 'typeof B' but present in type 'A'.
+tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(16,5): error TS2737: Property 'prop' is missing in type 'C' but present in type 'B'.
+tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts(17,5): error TS2737: Property 'prop' is missing in type 'typeof B' but present in type 'B'.
 
 
 ==== tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts (4 errors) ====
@@ -22,23 +18,19 @@ tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.
     var a: A = new B();
     a = new C(); // error prop is missing
     ~
-!!! error TS2322: Type 'C' is not assignable to type 'A'.
-!!! error TS2322:   Property 'prop' is missing in type 'C' but present in type 'A'.
+!!! error TS2737: Property 'prop' is missing in type 'C' but present in type 'A'.
     a = B; // error prop is missing
         ~
-!!! error TS2322: Type 'typeof B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'prop' is missing in type 'typeof B' but present in type 'A'.
+!!! error TS2737: Property 'prop' is missing in type 'typeof B' but present in type 'A'.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:13:5: Did you mean to use 'new' with this expression?
     a = C;
     
     var b: B = new C(); // error prop is missing
         ~
-!!! error TS2322: Type 'C' is not assignable to type 'B'.
-!!! error TS2322:   Property 'prop' is missing in type 'C' but present in type 'B'.
+!!! error TS2737: Property 'prop' is missing in type 'C' but present in type 'B'.
     b = B; // error prop is missing
         ~
-!!! error TS2322: Type 'typeof B' is not assignable to type 'B'.
-!!! error TS2322:   Property 'prop' is missing in type 'typeof B' but present in type 'B'.
+!!! error TS2737: Property 'prop' is missing in type 'typeof B' but present in type 'B'.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:17:5: Did you mean to use 'new' with this expression?
     b = C;
     b = a;
diff --git a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
index 62341d9cea51b..ce7608188e76c 100644
--- a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
+++ b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
@@ -75,8 +75,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(83,1): error TS2322: Type 'Fun
 tests/cases/compiler/strictFunctionTypesErrors.ts(84,1): error TS2322: Type 'Func<string, Func<string, void>>' is not assignable to type 'Func<string, Func<Object, void>>'.
   Type 'Func<string, void>' is not assignable to type 'Func<Object, void>'.
 tests/cases/compiler/strictFunctionTypesErrors.ts(111,1): error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
-  Type 'Animal' is not assignable to type 'Dog'.
-    Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
+  Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
 tests/cases/compiler/strictFunctionTypesErrors.ts(126,1): error TS2322: Type 'Crate<Dog>' is not assignable to type 'Crate<Animal>'.
   Types of property 'onSetItem' are incompatible.
     Type '(item: Dog) => void' is not assignable to type '(item: Animal) => void'.
@@ -320,8 +319,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(155,5): error TS2322: Type '(c
     animalComparer2 = dogComparer2;  // Error
     ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
-!!! error TS2322:   Type 'Animal' is not assignable to type 'Dog'.
-!!! error TS2322:     Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
+!!! error TS2322:   Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
     dogComparer2 = animalComparer2;  // Ok
     
     // Crate<T> is invariant in --strictFunctionTypes mode
diff --git a/tests/baselines/reference/strictTupleLength.errors.txt b/tests/baselines/reference/strictTupleLength.errors.txt
index 3b374074c2159..d6b5277bc80d8 100644
--- a/tests/baselines/reference/strictTupleLength.errors.txt
+++ b/tests/baselines/reference/strictTupleLength.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/tuple/strictTupleLength.ts(11,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't1' must be of type '[number]', but here has type '[number, number]'.
 tests/cases/conformance/types/tuple/strictTupleLength.ts(12,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't2' must be of type '[number, number]', but here has type '[number]'.
-tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2322: Type 'number[]' is not assignable to type '[number]'.
-  Property '0' is missing in type 'number[]' but present in type '[number]'.
+tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2737: Property '0' is missing in type 'number[]' but present in type '[number]'.
 
 
 ==== tests/cases/conformance/types/tuple/strictTupleLength.ts (3 errors) ====
@@ -28,7 +27,6 @@ tests/cases/conformance/types/tuple/strictTupleLength.ts(18,1): error TS2322: Ty
     
     t1 = arr; // error with or without strict
     ~~
-!!! error TS2322: Type 'number[]' is not assignable to type '[number]'.
-!!! error TS2322:   Property '0' is missing in type 'number[]' but present in type '[number]'.
+!!! error TS2737: Property '0' is missing in type 'number[]' but present in type '[number]'.
     arr = t1; // ok with or without strict
     
\ No newline at end of file
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
index b98686471382d..a9651c29379f4 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
@@ -4,10 +4,8 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(24,5): error TS2411: Property 'd' of type 'string' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(31,5): error TS2411: Property 'c' of type 'number' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(32,5): error TS2411: Property 'd' of type 'string' is not assignable to string index type 'A'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(37,8): error TS2322: Type 'typeof A' is not assignable to type 'A'.
-  Property 'foo' is missing in type 'typeof A' but present in type 'A'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(38,8): error TS2322: Type 'typeof B' is not assignable to type 'A'.
-  Property 'foo' is missing in type 'typeof B' but present in type 'A'.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(37,8): error TS2737: Property 'foo' is missing in type 'typeof A' but present in type 'A'.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(38,8): error TS2737: Property 'foo' is missing in type 'typeof B' but present in type 'A'.
 
 
 ==== tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts (8 errors) ====
@@ -61,12 +59,10 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
     var b: { [x: string]: A } = {
         a: A,
            ~
-!!! error TS2322: Type 'typeof A' is not assignable to type 'A'.
-!!! error TS2322:   Property 'foo' is missing in type 'typeof A' but present in type 'A'.
+!!! error TS2737: Property 'foo' is missing in type 'typeof A' but present in type 'A'.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:37:8: Did you mean to use 'new' with this expression?
         b: B
            ~
-!!! error TS2322: Type 'typeof B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'foo' is missing in type 'typeof B' but present in type 'A'.
+!!! error TS2737: Property 'foo' is missing in type 'typeof B' but present in type 'A'.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:38:8: Did you mean to use 'new' with this expression?
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolProperty10.errors.txt b/tests/baselines/reference/symbolProperty10.errors.txt
index 3d54347789e5f..292c091263104 100644
--- a/tests/baselines/reference/symbolProperty10.errors.txt
+++ b/tests/baselines/reference/symbolProperty10.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Type 'I' is not assignable to type 'C'.
   Types of property '[Symbol.iterator]' are incompatible.
-    Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-      Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
+    Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty10.ts (1 errors) ====
@@ -18,5 +17,4 @@ tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Typ
         ~
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
-!!! error TS2322:     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-!!! error TS2322:       Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
+!!! error TS2322:     Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolProperty52.errors.txt b/tests/baselines/reference/symbolProperty52.errors.txt
index 6296223b9cc31..8e730d2ecfbe2 100644
--- a/tests/baselines/reference/symbolProperty52.errors.txt
+++ b/tests/baselines/reference/symbolProperty52.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(2,13): error TS2339: Property 'nonsense' does not exist on type 'SymbolConstructor'.
-tests/cases/conformance/es6/Symbols/symbolProperty52.ts(5,1): error TS2322: Type '{}' is not assignable to type '{ [Symbol.nonsense]: number; }'.
-  Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
+tests/cases/conformance/es6/Symbols/symbolProperty52.ts(5,1): error TS2737: Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
 tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Property 'nonsense' does not exist on type 'SymbolConstructor'.
 
 
@@ -13,8 +12,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Pro
     
     obj = {};
     ~~~
-!!! error TS2322: Type '{}' is not assignable to type '{ [Symbol.nonsense]: number; }'.
-!!! error TS2322:   Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
+!!! error TS2737: Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
     
     obj[Symbol.nonsense];
                ~~~~~~~~
diff --git a/tests/baselines/reference/symbolProperty9.errors.txt b/tests/baselines/reference/symbolProperty9.errors.txt
index d3d9d870e0306..c172740e48208 100644
--- a/tests/baselines/reference/symbolProperty9.errors.txt
+++ b/tests/baselines/reference/symbolProperty9.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type 'I' is not assignable to type 'C'.
   Types of property '[Symbol.iterator]' are incompatible.
-    Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-      Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
+    Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty9.ts (1 errors) ====
@@ -18,5 +17,4 @@ tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type
         ~
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
-!!! error TS2322:     Type '{ x: any; }' is not assignable to type '{ x: any; y: any; }'.
-!!! error TS2322:       Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
+!!! error TS2322:     Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
index a4fb832007451..46697caaadb3d 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -34,12 +34,10 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(86,5): err
     Type 'void' is not assignable to type '{ y: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(107,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
   The 'this' types of each signature are incompatible.
-    Type 'C' is not assignable to type 'D'.
-      Type 'C' is missing the following properties from type 'D': x, explicitD
+    Type 'C' is missing the following properties from type 'D': x, explicitD
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(108,1): error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
   The 'this' types of each signature are incompatible.
-    Type '{ n: number; }' is not assignable to type '{ x: number; }'.
-      Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
+    Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(110,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
   The 'this' types of each signature are incompatible.
     Type 'C' is not assignable to type 'D'.
@@ -54,8 +52,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(113,1): er
     Type 'C' is not assignable to type 'D'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(114,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
   The 'this' types of each signature are incompatible.
-    Type '{ n: number; }' is not assignable to type 'D'.
-      Type '{ n: number; }' is missing the following properties from type 'D': x, explicitThis, explicitD
+    Type '{ n: number; }' is missing the following properties from type 'D': x, explicitThis, explicitD
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(115,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(116,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
   The 'this' types of each signature are incompatible.
@@ -66,8 +63,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(117,1): er
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(125,69): error TS2339: Property 'x' does not exist on type 'typeof Base1'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(145,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
   The 'this' types of each signature are incompatible.
-    Type 'Base1' is not assignable to type 'Base2'.
-      Property 'y' is missing in type 'Base1' but present in type 'Base2'.
+    Property 'y' is missing in type 'Base1' but present in type 'Base2'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(146,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
   The 'this' types of each signature are incompatible.
     Type 'Base1' is not assignable to type 'Base2'.
@@ -275,14 +271,12 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
     ~~~~~~~~~~~
 !!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
-!!! error TS2322:     Type 'C' is not assignable to type 'D'.
-!!! error TS2322:       Type 'C' is missing the following properties from type 'D': x, explicitD
+!!! error TS2322:     Type 'C' is missing the following properties from type 'D': x, explicitD
     c.explicitProperty = explicitXProperty;
     ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
-!!! error TS2322:     Type '{ n: number; }' is not assignable to type '{ x: number; }'.
-!!! error TS2322:       Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
+!!! error TS2322:     Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
     
     c.explicitC = d.explicitD;
     ~~~~~~~~~~~
@@ -308,8 +302,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
     ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
-!!! error TS2322:     Type '{ n: number; }' is not assignable to type 'D'.
-!!! error TS2322:       Type '{ n: number; }' is missing the following properties from type 'D': x, explicitThis, explicitD
+!!! error TS2322:     Type '{ n: number; }' is missing the following properties from type 'D': x, explicitThis, explicitD
     c.explicitThis = d.explicitThis;
     ~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
@@ -356,8 +349,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
     ~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
-!!! error TS2322:     Type 'Base1' is not assignable to type 'Base2'.
-!!! error TS2322:       Property 'y' is missing in type 'Base1' but present in type 'Base2'.
+!!! error TS2322:     Property 'y' is missing in type 'Base1' but present in type 'Base2'.
     b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
     ~~~~~~~~~~~
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
diff --git a/tests/baselines/reference/tsxAttributeResolution1.errors.txt b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
index dc9ac0654c18a..15aa8707d9219 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
@@ -6,8 +6,7 @@ tests/cases/conformance/jsx/file.tsx(25,2): error TS2322: Type '{ y: string; }'
 tests/cases/conformance/jsx/file.tsx(26,8): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/jsx/file.tsx(27,2): error TS2322: Type '{ var: string; }' is not assignable to type 'Attribs1'.
   Property 'var' does not exist on type 'Attribs1'.
-tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
-  Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
+tests/cases/conformance/jsx/file.tsx(29,2): error TS2737: Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
 tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -57,8 +56,7 @@ tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not a
     
     <test2 />; // Error, missing reqd
      ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type '{ reqd: string; }'.
-!!! error TS2322:   Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
+!!! error TS2737: Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
     <test2 reqd={10} />; // Error, reqd is not string
            ~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxAttributeResolution12.errors.txt b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
index 1210ae5d2ad2a..3808cda0906a1 100644
--- a/tests/baselines/reference/tsxAttributeResolution12.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
@@ -1,9 +1,7 @@
 tests/cases/conformance/jsx/file.tsx(25,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
-  Type '{}' is not assignable to type '{ reqd: any; }'.
-    Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
+  Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
 tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
-  Type '{}' is not assignable to type '{ reqd: any; }'.
-    Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
+  Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
 
 
 ==== tests/cases/conformance/jsx/react.d.ts (0 errors) ====
@@ -47,14 +45,12 @@ tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assi
     var t1 = <T />;
               ~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
-!!! error TS2322:   Type '{}' is not assignable to type '{ reqd: any; }'.
-!!! error TS2322:     Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
+!!! error TS2322:   Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
     
     // Should error
     var t2 = <TestMod.Test />;
               ~~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
-!!! error TS2322:   Type '{}' is not assignable to type '{ reqd: any; }'.
-!!! error TS2322:     Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
+!!! error TS2322:   Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution3.errors.txt b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
index 58f5db4a5162d..8a5eb7d704962 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/jsx/file.tsx(19,2): error TS2322: Type '{ x: number; }' is not assignable to type 'Attribs1'.
   Types of property 'x' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/jsx/file.tsx(23,2): error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'.
-  Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
+tests/cases/conformance/jsx/file.tsx(23,2): error TS2737: Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
 tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
@@ -35,8 +34,7 @@ tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not a
     var obj3 = { y: 32 };
     <test1 {...obj3} />
      ~~~~~
-!!! error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
+!!! error TS2737: Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
     
     // OK
     var obj4 = { x: 32, y: 32 };
diff --git a/tests/baselines/reference/tsxAttributeResolution5.errors.txt b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
index 23c3cb556f0d2..adc04e87bf595 100644
--- a/tests/baselines/reference/tsxAttributeResolution5.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
@@ -3,10 +3,8 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type 'T' is not assig
     Types of property 'x' are incompatible.
       Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(25,10): error TS2322: Type 'T' is not assignable to type 'Attribs1'.
-  Type '{ y: string; }' is not assignable to type 'Attribs1'.
-    Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
-tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assignable to type 'Attribs1'.
-  Property 'x' is missing in type '{}' but present in type 'Attribs1'.
+  Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
+tests/cases/conformance/jsx/file.tsx(29,2): error TS2737: Property 'x' is missing in type '{}' but present in type 'Attribs1'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -42,14 +40,12 @@ tests/cases/conformance/jsx/file.tsx(29,2): error TS2322: Type '{}' is not assig
     	return <test1 {...obj} />; // Error, missing x
     	        ~~~~~
 !!! error TS2322: Type 'T' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Type '{ y: string; }' is not assignable to type 'Attribs1'.
-!!! error TS2322:     Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
+!!! error TS2322:   Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
     }
     
     
     <test1 {...{}} />; // Error, missing x
      ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'Attribs1'.
-!!! error TS2322:   Property 'x' is missing in type '{}' but present in type 'Attribs1'.
+!!! error TS2737: Property 'x' is missing in type '{}' but present in type 'Attribs1'.
     <test2 {...{}} />; // Error, missing toString
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution6.errors.txt b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
index 902330d5e7a34..0d1b8d1948189 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/jsx/file.tsx(10,8): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(11,8): error TS2322: Type 'string' is not assignable to type 'boolean'.
-tests/cases/conformance/jsx/file.tsx(12,2): error TS2322: Type '{}' is not assignable to type '{ n: boolean; }'.
-  Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
+tests/cases/conformance/jsx/file.tsx(12,2): error TS2737: Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -24,8 +23,7 @@ tests/cases/conformance/jsx/file.tsx(12,2): error TS2322: Type '{}' is not assig
 !!! related TS6500 tests/cases/conformance/jsx/file.tsx:4:12: The expected type comes from property 'n' which is declared here on type '{ n?: boolean; s?: string; }'
     <test2 />;
      ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type '{ n: boolean; }'.
-!!! error TS2322:   Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
+!!! error TS2737: Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
     
     // OK
     <test1 n />;
diff --git a/tests/baselines/reference/tsxInvokeComponentType.errors.txt b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
index dc7997024ab08..eaee951f40748 100644
--- a/tests/baselines/reference/tsxInvokeComponentType.errors.txt
+++ b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
@@ -1,6 +1,4 @@
-tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { someKey: string; } & { children?: ReactNode; }'.
-  Type '{}' is not assignable to type '{ someKey: string; }'.
-    Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
+tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2737: Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
 
 
 ==== tests/cases/compiler/tsxInvokeComponentType.tsx (1 errors) ====
@@ -11,9 +9,7 @@ tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2322: Type '{}' i
     
     const bad = <Elem />;
                  ~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { someKey: string; } & { children?: ReactNode; }'.
-!!! error TS2322:   Type '{}' is not assignable to type '{ someKey: string; }'.
-!!! error TS2322:     Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
+!!! error TS2737: Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
     
     const good = <Elem someKey="ok" />;
     
diff --git a/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt b/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt
index d6e1cc5b3383d..b34ee77d1fbc5 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(55,12): error TS2322: Type '{ foo: number; }' is not assignable to type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
-  Type '{ foo: number; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }'.
-    Type '{ foo: number; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }': bar, baz
+  Type '{ foo: number; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }': bar, baz
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(57,12): error TS2322: Type '{ bar: string; baz: string; bat: string; }' is not assignable to type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
   Property 'bat' does not exist on type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(59,42): error TS2322: Type 'null' is not assignable to type 'string'.
@@ -10,8 +9,7 @@ tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(80,12): error TS2322
   Property 'bar' does not exist on type 'Defaultize<{}, { foo: number; }>'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(81,29): error TS2322: Type 'string' is not assignable to type 'number | undefined'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(98,12): error TS2322: Type '{ foo: string; }' is not assignable to type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
-  Type '{ foo: string; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }'.
-    Type '{ foo: string; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }': bar, baz
+  Type '{ foo: string; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }': bar, baz
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(100,12): error TS2322: Type '{ bar: string; baz: number; bat: string; }' is not assignable to type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
   Property 'bat' does not exist on type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
 tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(102,57): error TS2322: Type 'null' is not assignable to type 'number'.
@@ -81,8 +79,7 @@ tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(123,49): error TS232
     const b = <Component foo={12} />; // Error, missing required prop bar
                ~~~~~~~~~
 !!! error TS2322: Type '{ foo: number; }' is not assignable to type 'Defaultize<InferredPropTypes<{ foo: PropTypeChecker<number, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<string, true>; }>, { foo: number; }>'.
-!!! error TS2322:   Type '{ foo: number; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }'.
-!!! error TS2322:     Type '{ foo: number; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }': bar, baz
+!!! error TS2322:   Type '{ foo: number; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: string; }': bar, baz
     const c = <Component bar="yes" baz="yeah" />;
     const d = <Component bar="yes" baz="yo" bat="ohno" />; // Error, baz not a valid prop
                ~~~~~~~~~
@@ -145,8 +142,7 @@ tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx(123,49): error TS232
     const o = <BothWithSpecifiedGeneric foo="no" />; // Error, missing required prop bar
                ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ foo: string; }' is not assignable to type 'Defaultize<FooProps & InferredPropTypes<{ foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }>, { foo: string; }>'.
-!!! error TS2322:   Type '{ foo: string; }' is not assignable to type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }'.
-!!! error TS2322:     Type '{ foo: string; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }': bar, baz
+!!! error TS2322:   Type '{ foo: string; }' is missing the following properties from type '{ bar: string | number | ReactComponent<{}, {}> | null | undefined; baz: number; }': bar, baz
     const p = <BothWithSpecifiedGeneric bar="yes" baz={12} />;
     const q = <BothWithSpecifiedGeneric bar="yes" baz={12} bat="ohno" />; // Error, baz not a valid prop
                ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.errors.txt b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.errors.txt
index a12b61573cbd0..ae3d01d5e880d 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.errors.txt
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx(14,14): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & P'.
-  Type '{}' is not assignable to type 'P'.
-tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx(15,14): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComponent> & Readonly<{ children?: ReactNode; }> & Readonly<P>'.
-  Type '{}' is not assignable to type 'Readonly<P>'.
+tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx(14,14): error TS2322: Type '{}' is not assignable to type 'P'.
+tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx(15,14): error TS2322: Type '{}' is not assignable to type 'Readonly<P>'.
 
 
 ==== tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx (2 errors) ====
@@ -20,12 +18,10 @@ tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx(15,14): error TS2322: Type
         }
         let x = <MySFC />;  // should error
                  ~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & P'.
-!!! error TS2322:   Type '{}' is not assignable to type 'P'.
+!!! error TS2322: Type '{}' is not assignable to type 'P'.
         let y = <MyComponent />;  // should error
                  ~~~~~~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComponent> & Readonly<{ children?: ReactNode; }> & Readonly<P>'.
-!!! error TS2322:   Type '{}' is not assignable to type 'Readonly<P>'.
+!!! error TS2322: Type '{}' is not assignable to type 'Readonly<P>'.
     
         let z = <MySFC {...wrappedProps} /> // should work
         let q = <MyComponent {...wrappedProps} /> // should work
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
index f041816bf94d3..e335eafde4e46 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
@@ -1,6 +1,4 @@
-tests/cases/conformance/jsx/file.tsx(13,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'.
-  Type '{}' is not assignable to type 'Prop'.
-    Type '{}' is missing the following properties from type 'Prop': a, b
+tests/cases/conformance/jsx/file.tsx(13,11): error TS2735: Type '{}' is missing the following properties from type 'Prop': a, b
 tests/cases/conformance/jsx/file.tsx(19,18): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
@@ -19,9 +17,7 @@ tests/cases/conformance/jsx/file.tsx(19,18): error TS2322: Type 'string' is not
     // Error
     let x1 = <MyComp />
               ~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'.
-!!! error TS2322:   Type '{}' is not assignable to type 'Prop'.
-!!! error TS2322:     Type '{}' is missing the following properties from type 'Prop': a, b
+!!! error TS2735: Type '{}' is missing the following properties from type 'Prop': a, b
     
     // OK
     let x = <MyComp a={10} b="hi" />
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt
index 42b0f31d50e66..36b86e8aaf27c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt
@@ -1,9 +1,8 @@
 tests/cases/conformance/jsx/file.tsx(27,33): error TS2322: Type 'true' is not assignable to type 'false'.
 tests/cases/conformance/jsx/file.tsx(28,50): error TS2322: Type '3' is not assignable to type '2'.
-tests/cases/conformance/jsx/file.tsx(30,11): error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<OverWriteAttr> & Prop & { children?: ReactNode; }'.
-  Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'Prop'.
-    Types of property 'y' are incompatible.
-      Type 'true' is not assignable to type 'false'.
+tests/cases/conformance/jsx/file.tsx(30,11): error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'Prop'.
+  Types of property 'y' are incompatible.
+    Type 'true' is not assignable to type 'false'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
@@ -44,9 +43,8 @@ tests/cases/conformance/jsx/file.tsx(30,11): error TS2322: Type '{ y: true; x: 2
     let x2 = <OverWriteAttr {...anyobj} x={3} />
     let x3 = <OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} />
               ~~~~~~~~~~~~~
-!!! error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<OverWriteAttr> & Prop & { children?: ReactNode; }'.
-!!! error TS2322:   Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'Prop'.
-!!! error TS2322:     Types of property 'y' are incompatible.
-!!! error TS2322:       Type 'true' is not assignable to type 'false'.
+!!! error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'Prop'.
+!!! error TS2322:   Types of property 'y' are incompatible.
+!!! error TS2322:     Type 'true' is not assignable to type 'false'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
index 83d86734ca8cd..7548bc6bcfa7e 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/jsx/file.tsx(11,10): error TS2322: Type '{ property1: string; property2: number; }' is not assignable to type 'AnotherComponentProps'.
-  Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
+tests/cases/conformance/jsx/file.tsx(11,10): error TS2737: Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -15,8 +14,7 @@ tests/cases/conformance/jsx/file.tsx(11,10): error TS2322: Type '{ property1: st
             // Error: missing property
             <AnotherComponent {...props} />
              ~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ property1: string; property2: number; }' is not assignable to type 'AnotherComponentProps'.
-!!! error TS2322:   Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
+!!! error TS2737: Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
         );
     }
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
index d0860b73087a1..97efd5e585482 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
@@ -1,8 +1,5 @@
-tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{}' is not assignable to type 'PoisonedProp'.
-  Type '{}' is missing the following properties from type 'PoisonedProp': x, y
-tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'.
-  Type '{}' is not assignable to type 'PoisonedProp'.
-    Type '{}' is missing the following properties from type 'PoisonedProp': x, y
+tests/cases/conformance/jsx/file.tsx(20,10): error TS2735: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
+tests/cases/conformance/jsx/file.tsx(21,10): error TS2735: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
 tests/cases/conformance/jsx/file.tsx(22,19): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(22,21): error TS2322: Type 'true' is not assignable to type '"2"'.
 tests/cases/conformance/jsx/file.tsx(23,10): error TS2322: Type '{ x: number; y: "2"; }' is not assignable to type 'PoisonedProp'.
@@ -34,13 +31,10 @@ tests/cases/conformance/jsx/file.tsx(24,11): error TS2322: Type '{ X: string; x:
     // Error
     let p = <Poisoned {...obj} />;
              ~~~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'PoisonedProp'.
-!!! error TS2322:   Type '{}' is missing the following properties from type 'PoisonedProp': x, y
+!!! error TS2735: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
     let y = <Poisoned />;
              ~~~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'.
-!!! error TS2322:   Type '{}' is not assignable to type 'PoisonedProp'.
-!!! error TS2322:     Type '{}' is missing the following properties from type 'PoisonedProp': x, y
+!!! error TS2735: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
     let z = <Poisoned x y/>;
                       ~
 !!! error TS2322: Type 'true' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
index 495860b3dd3d6..430fd1d20b5df 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
@@ -1,7 +1,5 @@
 tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
-  Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; }'.
-    Type '{ editable: true; }' is not assignable to type '{ editable: true; onEdit: (newText: string) => void; }'.
-      Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
+  Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
@@ -20,9 +18,7 @@ tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: tru
     let x = <TextComponent editable={true} />
              ~~~~~~~~~~~~~
 !!! error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
-!!! error TS2322:   Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; }'.
-!!! error TS2322:     Type '{ editable: true; }' is not assignable to type '{ editable: true; onEdit: (newText: string) => void; }'.
-!!! error TS2322:       Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
+!!! error TS2322:   Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
     
     const textProps: TextProps = {
         editable: false
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
index 1e04bceda2067..bb894a33e347c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
@@ -1,17 +1,13 @@
 tests/cases/conformance/jsx/file.tsx(12,13): error TS2322: Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
   Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
-tests/cases/conformance/jsx/file.tsx(13,13): error TS2322: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
-  Type '{ yy: number; }' is not assignable to type '{ yy: number; yy1: string; }'.
-    Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
+tests/cases/conformance/jsx/file.tsx(13,13): error TS2737: Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
 tests/cases/conformance/jsx/file.tsx(14,31): error TS2322: Type 'true' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(16,13): error TS2322: Type '{ y1: number; yy: number; yy1: string; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
   Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
 tests/cases/conformance/jsx/file.tsx(17,13): error TS2322: Type '{ yy: boolean; yy1: string; }' is not assignable to type '{ yy: number; yy1: string; }'.
   Types of property 'yy' are incompatible.
     Type 'boolean' is not assignable to type 'number'.
-tests/cases/conformance/jsx/file.tsx(25,13): error TS2322: Type '{ extra-data: true; }' is not assignable to type 'IntrinsicAttributes & { yy: string; direction?: number; }'.
-  Type '{ extra-data: true; }' is not assignable to type '{ yy: string; direction?: number; }'.
-    Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
+tests/cases/conformance/jsx/file.tsx(25,13): error TS2737: Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
 tests/cases/conformance/jsx/file.tsx(26,40): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/jsx/file.tsx(33,32): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/jsx/file.tsx(34,29): error TS2322: Type 'string' is not assignable to type 'boolean'.
@@ -36,9 +32,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
 !!! error TS2322:   Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
     const c1 = <OneThing yy={10}/>;  // missing property;
                 ~~~~~~~~
-!!! error TS2322: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
-!!! error TS2322:   Type '{ yy: number; }' is not assignable to type '{ yy: number; yy1: string; }'.
-!!! error TS2322:     Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
+!!! error TS2737: Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
     const c2 = <OneThing {...obj} yy1 />; // type incompatible;
                                   ~~~
 !!! error TS2322: Type 'true' is not assignable to type 'string'.
@@ -62,9 +56,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
     // Error
     const d1 = <TestingOneThing extra-data />
                 ~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ extra-data: true; }' is not assignable to type 'IntrinsicAttributes & { yy: string; direction?: number; }'.
-!!! error TS2322:   Type '{ extra-data: true; }' is not assignable to type '{ yy: string; direction?: number; }'.
-!!! error TS2322:     Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
+!!! error TS2737: Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
     const d2 = <TestingOneThing yy="hello" direction="left" />
                                            ~~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
index f6817fe44b553..9dd80af9f5e10 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
@@ -3,9 +3,7 @@ tests/cases/conformance/jsx/file.tsx(19,10): error TS2322: Type '{ naaame: strin
 tests/cases/conformance/jsx/file.tsx(27,15): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/jsx/file.tsx(29,10): error TS2322: Type '{ naaaaaaame: string; }' is not assignable to type 'IntrinsicAttributes & { name?: string; }'.
   Property 'naaaaaaame' does not exist on type 'IntrinsicAttributes & { name?: string; }'.
-tests/cases/conformance/jsx/file.tsx(34,10): error TS2322: Type '{ extra-prop-name: string; }' is not assignable to type 'IntrinsicAttributes & { "prop-name": string; }'.
-  Type '{ extra-prop-name: string; }' is not assignable to type '{ "prop-name": string; }'.
-    Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
+tests/cases/conformance/jsx/file.tsx(34,10): error TS2737: Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
 tests/cases/conformance/jsx/file.tsx(37,10): error TS2322: Type '{ prop1: true; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'prop1' does not exist on type 'IntrinsicAttributes'.
 tests/cases/conformance/jsx/file.tsx(38,11): error TS2322: Type '{ ref: (x: any) => any; }' is not assignable to type 'IntrinsicAttributes'.
@@ -58,9 +56,7 @@ tests/cases/conformance/jsx/file.tsx(45,11): error TS2559: Type '{ prop1: boolea
     // Error
     let h = <MeetAndGreet extra-prop-name="World" />;
              ~~~~~~~~~~~~
-!!! error TS2322: Type '{ extra-prop-name: string; }' is not assignable to type 'IntrinsicAttributes & { "prop-name": string; }'.
-!!! error TS2322:   Type '{ extra-prop-name: string; }' is not assignable to type '{ "prop-name": string; }'.
-!!! error TS2322:     Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
+!!! error TS2737: Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
     
     // Error
     let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
index 4606c1e1bc432..de4fcc59bab6f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
@@ -1,9 +1,6 @@
-tests/cases/conformance/jsx/file.tsx(9,15): error TS2322: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: number; }'.
-  Type '{ a: number; }' is not assignable to type '{ b: {}; a: number; }'.
-    Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
+tests/cases/conformance/jsx/file.tsx(9,15): error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
 tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
-  Type 'T & { ignore-prop: true; }' is not assignable to type '{ b: {}; a: {}; }'.
-    Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
+  Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (2 errors) ====
@@ -17,12 +14,9 @@ tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-pr
     function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, arg2: U) {
         let a0 = <OverloadComponent a={arg1.b}/>
                   ~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: number; }'.
-!!! error TS2322:   Type '{ a: number; }' is not assignable to type '{ b: {}; a: number; }'.
-!!! error TS2322:     Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
+!!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
         let a2 = <OverloadComponent {...arg1} ignore-prop />  // missing a
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
-!!! error TS2322:   Type 'T & { ignore-prop: true; }' is not assignable to type '{ b: {}; a: {}; }'.
-!!! error TS2322:     Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
+!!! error TS2322:   Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxUnionElementType6.errors.txt b/tests/baselines/reference/tsxUnionElementType6.errors.txt
index 13b2ea60e0763..751cb75e0e954 100644
--- a/tests/baselines/reference/tsxUnionElementType6.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType6.errors.txt
@@ -1,12 +1,8 @@
 tests/cases/conformance/jsx/file.tsx(18,10): error TS2322: Type '{ x: true; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'x' does not exist on type 'IntrinsicAttributes'.
 tests/cases/conformance/jsx/file.tsx(19,27): error TS2322: Type 'string' is not assignable to type 'boolean'.
-tests/cases/conformance/jsx/file.tsx(20,10): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
-  Type '{}' is not assignable to type '{ x: boolean; }'.
-    Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
-tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{ data-prop: true; }' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
-  Type '{ data-prop: true; }' is not assignable to type '{ x: boolean; }'.
-    Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
+tests/cases/conformance/jsx/file.tsx(20,10): error TS2737: Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
+tests/cases/conformance/jsx/file.tsx(21,10): error TS2737: Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
 
 
 ==== tests/cases/conformance/jsx/file.tsx (4 errors) ====
@@ -37,13 +33,9 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2322: Type '{ data-prop: tr
 !!! related TS6500 tests/cases/conformance/jsx/file.tsx:11:23: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & { x: boolean; }'
     let c = <SFC2AndEmptyComp />;
              ~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
-!!! error TS2322:   Type '{}' is not assignable to type '{ x: boolean; }'.
-!!! error TS2322:     Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
+!!! error TS2737: Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
     let d = <SFC2AndEmptyComp data-prop />;
              ~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ data-prop: true; }' is not assignable to type 'IntrinsicAttributes & { x: boolean; }'.
-!!! error TS2322:   Type '{ data-prop: true; }' is not assignable to type '{ x: boolean; }'.
-!!! error TS2322:     Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
+!!! error TS2737: Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tupleTypes.errors.txt b/tests/baselines/reference/tupleTypes.errors.txt
index 883bfed56f16b..e5460c10696bd 100644
--- a/tests/baselines/reference/tupleTypes.errors.txt
+++ b/tests/baselines/reference/tupleTypes.errors.txt
@@ -1,9 +1,7 @@
 tests/cases/compiler/tupleTypes.ts(11,12): error TS2339: Property '2' does not exist on type '[number, string]'.
 tests/cases/compiler/tupleTypes.ts(12,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 't2' must be of type 'undefined', but here has type 'string | number'.
-tests/cases/compiler/tupleTypes.ts(14,1): error TS2322: Type '[]' is not assignable to type '[number, string]'.
-  Type '[]' is missing the following properties from type '[number, string]': 0, 1
-tests/cases/compiler/tupleTypes.ts(15,1): error TS2322: Type '[number]' is not assignable to type '[number, string]'.
-  Property '1' is missing in type '[number]' but present in type '[number, string]'.
+tests/cases/compiler/tupleTypes.ts(14,1): error TS2735: Type '[]' is missing the following properties from type '[number, string]': 0, 1
+tests/cases/compiler/tupleTypes.ts(15,1): error TS2737: Property '1' is missing in type '[number]' but present in type '[number, string]'.
 tests/cases/compiler/tupleTypes.ts(17,6): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/tupleTypes.ts(17,15): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/tupleTypes.ts(18,1): error TS2322: Type '[number, string, number]' is not assignable to type '[number, string]'.
@@ -44,12 +42,10 @@ tests/cases/compiler/tupleTypes.ts(51,1): error TS2322: Type '[number, {}]' is n
     
     t = [];               // Error
     ~
-!!! error TS2322: Type '[]' is not assignable to type '[number, string]'.
-!!! error TS2322:   Type '[]' is missing the following properties from type '[number, string]': 0, 1
+!!! error TS2735: Type '[]' is missing the following properties from type '[number, string]': 0, 1
     t = [1];              // Error
     ~
-!!! error TS2322: Type '[number]' is not assignable to type '[number, string]'.
-!!! error TS2322:   Property '1' is missing in type '[number]' but present in type '[number, string]'.
+!!! error TS2737: Property '1' is missing in type '[number]' but present in type '[number, string]'.
     t = [1, "hello"];     // Ok
     t = ["hello", 1];     // Error
          ~~~~~~~
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
index 88ad446b60a2e..98239b279a7b6 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
@@ -11,8 +11,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(30,5):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(31,1): error TS1128: Declaration or statement expected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(33,38): error TS1225: Cannot find parameter 'x'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(37,51): error TS2677: A type predicate's type must be assignable to its parameter's type.
-  Type 'B' is not assignable to type 'A'.
-    Property 'propA' is missing in type 'B' but present in type 'A'.
+  Property 'propA' is missing in type 'B' but present in type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(41,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
   Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(45,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
@@ -133,8 +132,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
     function hasNonMatchingParameterType1(x: A): x is B {
                                                       ~
 !!! error TS2677: A type predicate's type must be assignable to its parameter's type.
-!!! error TS2677:   Type 'B' is not assignable to type 'A'.
-!!! error TS2677:     Property 'propA' is missing in type 'B' but present in type 'A'.
+!!! error TS2677:   Property 'propA' is missing in type 'B' but present in type 'A'.
         return true;
     }
     
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
index 87be0299959e8..fc850c69f8cbf 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(23,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
-    Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
-      Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
+    Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(24,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
-    Type 'FollowerGuard' is not assignable to type 'LeadGuard'.
-      Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
+    Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(26,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
@@ -44,14 +42,12 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors
     ~~~~~~~~~~~~
 !!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
 !!! error TS2322:   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
-!!! error TS2322:     Type 'LeadGuard' is not assignable to type 'FollowerGuard'.
-!!! error TS2322:       Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
+!!! error TS2322:     Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
     b.isLeader = b.isFollower;
     ~~~~~~~~~~
 !!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
 !!! error TS2322:   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
-!!! error TS2322:     Type 'FollowerGuard' is not assignable to type 'LeadGuard'.
-!!! error TS2322:       Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
+!!! error TS2322:     Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
     
     a.isFollower = a.isLeader;
     ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/typeMatch1.errors.txt b/tests/baselines/reference/typeMatch1.errors.txt
index 87dc0df8727e0..492880ca2dc26 100644
--- a/tests/baselines/reference/typeMatch1.errors.txt
+++ b/tests/baselines/reference/typeMatch1.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/compiler/typeMatch1.ts(18,1): error TS2322: Type 'D' is not assignable to type 'C'.
   Types have separate declarations of a private property 'x'.
-tests/cases/compiler/typeMatch1.ts(19,4): error TS2322: Type 'typeof C' is not assignable to type 'C'.
-  Property 'x' is missing in type 'typeof C' but present in type 'C'.
+tests/cases/compiler/typeMatch1.ts(19,4): error TS2737: Property 'x' is missing in type 'typeof C' but present in type 'C'.
 tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will always return 'false' since the types 'typeof C' and 'typeof D' have no overlap.
 
 
@@ -29,8 +28,7 @@ tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will alwa
 !!! error TS2322:   Types have separate declarations of a private property 'x'.
     x6=C;
        ~
-!!! error TS2322: Type 'typeof C' is not assignable to type 'C'.
-!!! error TS2322:   Property 'x' is missing in type 'typeof C' but present in type 'C'.
+!!! error TS2737: Property 'x' is missing in type 'typeof C' but present in type 'C'.
 !!! related TS6213 tests/cases/compiler/typeMatch1.ts:19:4: Did you mean to use 'new' with this expression?
     C==D;
     ~~~~
diff --git a/tests/baselines/reference/typeMatch2.errors.txt b/tests/baselines/reference/typeMatch2.errors.txt
index 880a858939c0e..f77681d06aecf 100644
--- a/tests/baselines/reference/typeMatch2.errors.txt
+++ b/tests/baselines/reference/typeMatch2.errors.txt
@@ -1,21 +1,17 @@
-tests/cases/compiler/typeMatch2.ts(3,2): error TS2322: Type '{}' is not assignable to type '{ x: number; y: number; }'.
-  Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
-tests/cases/compiler/typeMatch2.ts(4,5): error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-  Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
+tests/cases/compiler/typeMatch2.ts(3,2): error TS2735: Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
+tests/cases/compiler/typeMatch2.ts(4,5): error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(5,20): error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(6,17): error TS2322: Type '{ x: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
 tests/cases/compiler/typeMatch2.ts(18,5): error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
-  Type 'Animal' is not assignable to type 'Giraffe'.
-    Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
+  Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
 tests/cases/compiler/typeMatch2.ts(22,5): error TS2322: Type '{ f1: number; f2: Animal[]; }' is not assignable to type '{ f1: number; f2: Giraffe[]; }'.
   Types of property 'f2' are incompatible.
     Type 'Animal[]' is not assignable to type 'Giraffe[]'.
 tests/cases/compiler/typeMatch2.ts(34,26): error TS2322: Type '{ x: number; y: any; z: number; }' is not assignable to type '{ x: number; y: number; }'.
   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
-tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-  Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
+tests/cases/compiler/typeMatch2.ts(35,5): error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
 
 
 ==== tests/cases/compiler/typeMatch2.ts (8 errors) ====
@@ -23,12 +19,10 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
     	var a = { x: 1, y: 2 };
     	a = {}; // error
     	~
-!!! error TS2322: Type '{}' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
+!!! error TS2735: Type '{}' is missing the following properties from type '{ x: number; y: number; }': x, y
         a = { x: 1 }; // error
         ~
-!!! error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
+!!! error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
     	a = { x: 1, y: 2, z: 3 };
     	                  ~~~~
 !!! error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
@@ -51,8 +45,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
         gg = aa; // error
         ~~
 !!! error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
-!!! error TS2322:   Type 'Animal' is not assignable to type 'Giraffe'.
-!!! error TS2322:     Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
+!!! error TS2322:   Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
         var xa = { f1: 5, f2: aa };
         var xb = { f1: 5, f2: gg };
         xa = xb; // Should be ok
@@ -78,8 +71,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2322: Type '{ x: number; }' is
 !!! error TS2322:   Object literal may only specify known properties, and 'z' does not exist in type '{ x: number; y: number; }'.
         a = { x: 1 }; // error
         ~
-!!! error TS2322: Type '{ x: number; }' is not assignable to type '{ x: number; y: number; }'.
-!!! error TS2322:   Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
+!!! error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
         var mf = function m(n) { return false; };
         var zf = function z(n: number) { return true; };
         mf=zf;
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
index b944456242340..073731a2cd103 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'b' is missing in type 'A' but present in type 'B'.
+tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30): error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts (1 errors) ====
@@ -11,6 +10,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30):
     
     var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
                                  ~
-!!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
+!!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 !!! 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 a9d5b1bbcb795..41d2ff1b70c9a 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35): error TS2322: Type 'A' is not assignable to type 'B'.
-  Property 'b' is missing in type 'A' but present in type 'B'.
+tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35): error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 
 
 ==== tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts (1 errors) ====
@@ -11,6 +10,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35):
     
     var d = f(a, b, u2 => u2.b, t2 => t2);
                                       ~~
-!!! error TS2322: Type 'A' is not assignable to type 'B'.
-!!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
+!!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
 !!! 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/typeRelationships.errors.txt b/tests/baselines/reference/typeRelationships.errors.txt
index d79df69b458c7..1c31e0f017617 100644
--- a/tests/baselines/reference/typeRelationships.errors.txt
+++ b/tests/baselines/reference/typeRelationships.errors.txt
@@ -1,6 +1,5 @@
 tests/cases/conformance/types/thisType/typeRelationships.ts(9,9): error TS2322: Type 'C' is not assignable to type 'this'.
-tests/cases/conformance/types/thisType/typeRelationships.ts(35,9): error TS2322: Type 'C' is not assignable to type 'D'.
-  Type 'C' is missing the following properties from type 'D': self1, self2, self3, d, bar
+tests/cases/conformance/types/thisType/typeRelationships.ts(35,9): error TS2735: Type 'C' is missing the following properties from type 'D': self1, self2, self3, d, bar
 tests/cases/conformance/types/thisType/typeRelationships.ts(36,9): error TS2322: Type 'D' is not assignable to type 'this'.
 
 
@@ -43,8 +42,7 @@ tests/cases/conformance/types/thisType/typeRelationships.ts(36,9): error TS2322:
             this.d = this.self;
             this.d = this.c;  // Error
             ~~~~~~
-!!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Type 'C' is missing the following properties from type 'D': self1, self2, self3, d, bar
+!!! error TS2735: Type 'C' is missing the following properties from type 'D': self1, self2, self3, d, bar
             this.self = this.d;  // Error
             ~~~~~~~~~
 !!! error TS2322: Type 'D' is not assignable to type 'this'.
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
index 02d112a05c519..2a7d290b9a350 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/typeofAmbientExternalModules_2.ts(7,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-  Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
+tests/cases/compiler/typeofAmbientExternalModules_2.ts(7,1): error TS2737: Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2737: Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
 
 
 ==== tests/cases/compiler/typeofAmbientExternalModules_2.ts (2 errors) ====
@@ -13,13 +11,11 @@ tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type
     var y1: typeof ext = ext;
     y1 = exp;
     ~~
-!!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
-!!! error TS2322:   Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+!!! error TS2737: Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
-!!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
+!!! error TS2737: Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' but present in type 'typeof D'.
 ==== tests/cases/compiler/typeofAmbientExternalModules_0.ts (0 errors) ====
     export class C { foo: string; }
     
diff --git a/tests/baselines/reference/typeofExternalModules.errors.txt b/tests/baselines/reference/typeofExternalModules.errors.txt
index 2692c88b81064..cc47f915d19f5 100644
--- a/tests/baselines/reference/typeofExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofExternalModules.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/compiler/typeofExternalModules_core.ts(5,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-  Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
+tests/cases/compiler/typeofExternalModules_core.ts(5,1): error TS2737: Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2737: Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
 
 
 ==== tests/cases/compiler/typeofExternalModules_core.ts (2 errors) ====
@@ -11,13 +9,11 @@ tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typ
     var y1: typeof ext = ext;
     y1 = exp;
     ~~
-!!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
-!!! error TS2322:   Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+!!! error TS2737: Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
-!!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
+!!! error TS2737: Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' but present in type 'typeof D'.
 ==== tests/cases/compiler/typeofExternalModules_external.ts (0 errors) ====
     export class C { }
     
diff --git a/tests/baselines/reference/typeofInternalModules.errors.txt b/tests/baselines/reference/typeofInternalModules.errors.txt
index d3273b190441f..27bcda3319324 100644
--- a/tests/baselines/reference/typeofInternalModules.errors.txt
+++ b/tests/baselines/reference/typeofInternalModules.errors.txt
@@ -1,10 +1,8 @@
 tests/cases/compiler/typeofInternalModules.ts(15,16): error TS2708: Cannot use namespace 'importUninst' as a value.
 tests/cases/compiler/typeofInternalModules.ts(17,9): error TS2709: Cannot use namespace 'Outer' as a type.
-tests/cases/compiler/typeofInternalModules.ts(19,1): error TS2322: Type 'typeof Outer' is not assignable to type 'typeof instantiated'.
-  Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
+tests/cases/compiler/typeofInternalModules.ts(19,1): error TS2737: Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
 tests/cases/compiler/typeofInternalModules.ts(21,16): error TS2708: Cannot use namespace 'importUninst' as a value.
-tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof instantiated' is not assignable to type 'typeof Outer'.
-  Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
+tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2737: Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
 
 
 ==== tests/cases/compiler/typeofInternalModules.ts (5 errors) ====
@@ -32,8 +30,7 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof
     var x5: typeof importInst;
     x5 = Outer;
     ~~
-!!! error TS2322: Type 'typeof Outer' is not assignable to type 'typeof instantiated'.
-!!! error TS2322:   Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
+!!! error TS2737: Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
     x5 = Outer.instantiated;
     var x6: typeof importUninst;
                    ~~~~~~~~~~~~
@@ -41,6 +38,5 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2322: Type 'typeof
     var x7: typeof Outer = Outer;
     x7 = importInst;
     ~~
-!!! error TS2322: Type 'typeof instantiated' is not assignable to type 'typeof Outer'.
-!!! error TS2322:   Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
+!!! error TS2737: Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
index b302857d698a7..95ba35fce27f9 100644
--- a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
+++ b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
@@ -36,15 +36,12 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(56,11): error TS2322: Type '"a"' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(59,12): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(62,12): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(64,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'IterableIterator<number>'.
-  Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
-tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(67,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterable<number>'.
-  Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
+tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(64,42): error TS2737: Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
+tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(67,42): error TS2737: Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(70,42): error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterator<number>'.
   Types of property 'next' are incompatible.
     Type '(value?: any) => Promise<IteratorResult<any>>' is not assignable to type '(value?: any) => IteratorResult<number>'.
-      Type 'Promise<IteratorResult<any>>' is not assignable to type 'IteratorResult<number>'.
-        Type 'Promise<IteratorResult<any>>' is missing the following properties from type 'IteratorResult<number>': done, value
+      Type 'Promise<IteratorResult<any>>' is missing the following properties from type 'IteratorResult<number>': done, value
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(74,12): error TS2504: Type '{}' must have a '[Symbol.asyncIterator]()' method that returns an async iterator.
 
 
@@ -172,14 +169,12 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
     }
     async function * explicitReturnType10(): IterableIterator<number> {
                                              ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'IterableIterator<number>'.
-!!! error TS2322:   Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
+!!! error TS2737: Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
         yield 1;
     }
     async function * explicitReturnType11(): Iterable<number> {
                                              ~~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterable<number>'.
-!!! error TS2322:   Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
+!!! error TS2737: Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
         yield 1;
     }
     async function * explicitReturnType12(): Iterator<number> {
@@ -187,8 +182,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
 !!! error TS2322: Type 'AsyncIterableIterator<any>' is not assignable to type 'Iterator<number>'.
 !!! error TS2322:   Types of property 'next' are incompatible.
 !!! error TS2322:     Type '(value?: any) => Promise<IteratorResult<any>>' is not assignable to type '(value?: any) => IteratorResult<number>'.
-!!! error TS2322:       Type 'Promise<IteratorResult<any>>' is not assignable to type 'IteratorResult<number>'.
-!!! error TS2322:         Type 'Promise<IteratorResult<any>>' is missing the following properties from type 'IteratorResult<number>': done, value
+!!! error TS2322:       Type 'Promise<IteratorResult<any>>' is missing the following properties from type 'IteratorResult<number>': done, value
         yield 1;
     }
     async function * yieldStar() {
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
index f043250e4f02b..14b03b29375d4 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
@@ -1,5 +1,4 @@
-tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
-  Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
+tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2737: Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
 
 
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
@@ -9,8 +8,7 @@ tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeo
     var x: typeof foo0 = {};
     var y: {M2: Object} = foo0;
         ~
-!!! error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
-!!! error TS2322:   Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
+!!! error TS2737: Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
     
 ==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
     export interface Person {
diff --git a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
index e7be977394654..c69059ccba6ba 100644
--- a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
+++ b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
@@ -1,15 +1,12 @@
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(25,1): error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
-    Type 'Foo' is not assignable to type 'Bar'.
-      Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
+    Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(26,1): error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
-    Type 'Foo' is not assignable to type 'Baz'.
-      Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
+    Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(27,1): error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
-    Type 'Foo' is not assignable to type 'Kwah'.
-      Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
+    Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(48,1): error TS2322: Type 'X<Foo>' is not assignable to type 'X<Bar> | Y<Baz> | Z<Kwah>'.
   Type 'X<Foo>' is not assignable to type 'X<Bar>'.
     Types of property 'xProp' are incompatible.
@@ -53,20 +50,17 @@ tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(50,1): error TS2322: Typ
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
-!!! error TS2322:     Type 'Foo' is not assignable to type 'Bar'.
-!!! error TS2322:       Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
+!!! error TS2322:     Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
     thingOfInterfaces = b;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
-!!! error TS2322:     Type 'Foo' is not assignable to type 'Baz'.
-!!! error TS2322:       Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
+!!! error TS2322:     Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
     thingOfInterfaces = c;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
-!!! error TS2322:     Type 'Foo' is not assignable to type 'Kwah'.
-!!! error TS2322:       Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
+!!! error TS2322:     Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
     
     ////////
     
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
index 29ef071b92975..6581733b88bdd 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
@@ -1,13 +1,11 @@
 tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(19,1): error TS2322: Type 'Property' is not assignable to type 'Class'.
   Types of property 'parent' are incompatible.
     Type 'Module | Class' is not assignable to type 'Namespace'.
-      Type 'Class' is not assignable to type 'Namespace'.
-        Property 'members' is missing in type 'Class' but present in type 'Namespace'.
+      Property 'members' is missing in type 'Class' but present in type 'Namespace'.
 tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2322: Type 'Class' is not assignable to type 'Property'.
   Types of property 'parent' are incompatible.
     Type 'Namespace' is not assignable to type 'Module | Class'.
-      Type 'Namespace' is not assignable to type 'Class'.
-        Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
+      Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
 
 
 ==== tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts (2 errors) ====
@@ -34,13 +32,11 @@ tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2
 !!! error TS2322: Type 'Property' is not assignable to type 'Class'.
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Module | Class' is not assignable to type 'Namespace'.
-!!! error TS2322:       Type 'Class' is not assignable to type 'Namespace'.
-!!! error TS2322:         Property 'members' is missing in type 'Class' but present in type 'Namespace'.
+!!! error TS2322:       Property 'members' is missing in type 'Class' but present in type 'Namespace'.
     p = c;
     ~
 !!! error TS2322: Type 'Class' is not assignable to type 'Property'.
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Namespace' is not assignable to type 'Module | Class'.
-!!! error TS2322:       Type 'Namespace' is not assignable to type 'Class'.
-!!! error TS2322:         Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
+!!! error TS2322:       Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypesAssignability.errors.txt b/tests/baselines/reference/unionTypesAssignability.errors.txt
index b8dac179d323c..e23eaf7ed646d 100644
--- a/tests/baselines/reference/unionTypesAssignability.errors.txt
+++ b/tests/baselines/reference/unionTypesAssignability.errors.txt
@@ -1,9 +1,7 @@
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(18,1): error TS2322: Type 'E' is not assignable to type 'D'.
-  Property 'foo1' is missing in type 'E' but present in type 'D'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(18,1): error TS2737: Property 'foo1' is missing in type 'E' but present in type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(19,1): error TS2322: Type 'D | E' is not assignable to type 'D'.
   Type 'E' is not assignable to type 'D'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(20,1): error TS2322: Type 'D' is not assignable to type 'E'.
-  Property 'foo2' is missing in type 'D' but present in type 'E'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(20,1): error TS2737: Property 'foo2' is missing in type 'D' but present in type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(22,1): error TS2322: Type 'D | E' is not assignable to type 'E'.
   Type 'D' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(24,1): error TS2322: Type 'string' is not assignable to type 'number'.
@@ -12,10 +10,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(26,1): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(28,1): error TS2322: Type 'string | number' is not assignable to type 'string'.
   Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(31,1): error TS2322: Type 'C' is not assignable to type 'D'.
-  Property 'foo1' is missing in type 'C' but present in type 'D'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(32,1): error TS2322: Type 'C' is not assignable to type 'E'.
-  Property 'foo2' is missing in type 'C' but present in type 'E'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(31,1): error TS2737: Property 'foo1' is missing in type 'C' but present in type 'D'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(32,1): error TS2737: Property 'foo2' is missing in type 'C' but present in type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(33,1): error TS2322: Type 'C' is not assignable to type 'D | E'.
   Type 'C' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts(35,1): error TS2322: Type 'D' is not assignable to type 'E'.
@@ -50,16 +46,14 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = d;
     d = e;
     ~
-!!! error TS2322: Type 'E' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo1' is missing in type 'E' but present in type 'D'.
+!!! error TS2737: Property 'foo1' is missing in type 'E' but present in type 'D'.
     d = unionDE; // error e is not assignable to d
     ~
 !!! error TS2322: Type 'D | E' is not assignable to type 'D'.
 !!! error TS2322:   Type 'E' is not assignable to type 'D'.
     e = d;
     ~
-!!! error TS2322: Type 'D' is not assignable to type 'E'.
-!!! error TS2322:   Property 'foo2' is missing in type 'D' but present in type 'E'.
+!!! error TS2737: Property 'foo2' is missing in type 'D' but present in type 'E'.
     e = e;
     e = unionDE; // error d is not assignable to e
     ~
@@ -85,12 +79,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     // A type T is assignable to a union type U if T is assignable to any type in U
     d = c;
     ~
-!!! error TS2322: Type 'C' is not assignable to type 'D'.
-!!! error TS2322:   Property 'foo1' is missing in type 'C' but present in type 'D'.
+!!! error TS2737: Property 'foo1' is missing in type 'C' but present in type 'D'.
     e = c;
     ~
-!!! error TS2322: Type 'C' is not assignable to type 'E'.
-!!! error TS2322:   Property 'foo2' is missing in type 'C' but present in type 'E'.
+!!! error TS2737: Property 'foo2' is missing in type 'C' but present in type 'E'.
     unionDE = c; // error since C is not assinable to either D or E
     ~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D | E'.

From 267e48a2703c3f25ea13e97a59b97b65cbf27167 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 1 Nov 2018 17:13:33 -0700
Subject: [PATCH 4/6] Add related span

---
 src/compiler/checker.ts                       | 20 ++++++++++++-
 .../reference/arrayAssignmentTest1.errors.txt |  8 +++++
 .../reference/arrayAssignmentTest2.errors.txt |  3 ++
 .../reference/arrayAssignmentTest5.errors.txt |  1 +
 .../baselines/reference/arrayFrom.errors.txt  |  1 +
 ...typeIsAssignableToReadonlyArray.errors.txt |  1 +
 ...ambdaToNominalSubtypeOfFunction.errors.txt |  2 ++
 .../reference/assignmentCompat1.errors.txt    |  2 ++
 .../reference/assignmentCompatBug2.errors.txt |  3 ++
 ...CompatFunctionsWithOptionalArgs.errors.txt |  3 +-
 ...gnmentCompatWithCallSignatures2.errors.txt |  8 +++++
 ...gnmentCompatWithCallSignatures3.errors.txt |  1 +
 ...tCompatWithConstructSignatures2.errors.txt |  8 +++++
 ...tCompatWithConstructSignatures3.errors.txt |  1 +
 ...ignmentCompatWithNumericIndexer.errors.txt |  1 +
 ...gnmentCompatWithNumericIndexer2.errors.txt |  1 +
 ...gnmentCompatWithNumericIndexer3.errors.txt |  2 ++
 ...ignmentCompatWithObjectMembers4.errors.txt |  3 ++
 ...ignmentCompatWithObjectMembers5.errors.txt |  4 ++-
 ...atWithObjectMembersOptionality2.errors.txt |  9 ++++++
 ...ObjectMembersStringNumericNames.errors.txt | 29 +++++++++++++++++++
 ...signmentCompatWithStringIndexer.errors.txt |  1 +
 ...ignmentCompatWithStringIndexer2.errors.txt |  1 +
 ...ember-off-of-function-interface.errors.txt |  3 ++
 ...ember-off-of-function-interface.errors.txt |  3 ++
 tests/baselines/reference/bases.errors.txt    |  1 +
 .../reference/bluebirdStaticThis.errors.txt   |  1 +
 .../reference/chainedAssignment1.errors.txt   |  1 +
 .../reference/chainedAssignment3.errors.txt   |  1 +
 .../chainedAssignmentChecking.errors.txt      |  1 +
 ...ConstrainedToOtherTypeParameter.errors.txt |  1 +
 .../reference/checkJsdocTypeTag6.errors.txt   |  1 +
 .../checkJsxChildrenProperty2.errors.txt      |  1 +
 .../checkJsxChildrenProperty5.errors.txt      |  1 +
 ...assCanExtendConstructorFunction.errors.txt |  1 +
 .../classImplementsClass2.errors.txt          |  4 ++-
 .../classImplementsClass4.errors.txt          |  4 ++-
 .../classImplementsClass7.errors.txt          |  1 +
 ...sImplementsMergedClassInterface.errors.txt |  2 ++
 .../clodulesDerivedClasses.errors.txt         |  1 +
 ...onalOperatorWithoutIdenticalBCT.errors.txt |  2 ++
 .../reference/conditionalTypes2.errors.txt    |  3 ++
 .../reference/constraints0.errors.txt         |  1 +
 ...atureInstatiationContravariance.errors.txt |  1 +
 ...lTypeWithUnionTypeObjectLiteral.errors.txt |  1 +
 .../reference/contextualTyping.errors.txt     |  1 +
 .../reference/contextualTyping11.errors.txt   |  3 +-
 .../reference/contextualTyping5.errors.txt    |  3 +-
 .../reference/covariantCallbacks.errors.txt   |  1 +
 ...ertyIsRelatableToTargetProperty.errors.txt |  1 +
 .../deeplyNestedAssignabilityIssue.errors.txt | 10 +++++++
 ...tructuringParameterDeclaration5.errors.txt |  2 ++
 ...orExpressionsWhichCouldBeCalled.errors.txt |  1 +
 .../differentTypesWithSameName.errors.txt     |  3 +-
 .../reference/elaboratedErrors.errors.txt     |  2 ++
 .../errorsWithInvokablesInUnions01.errors.txt |  1 +
 ...AnnotationAndInvalidInitializer.errors.txt |  3 ++
 .../excessPropertyCheckWithUnions.errors.txt  |  1 +
 .../exportDefaultStripsFreshness.errors.txt   |  2 ++
 ...fixingTypeParametersRepeatedly2.errors.txt |  1 +
 tests/baselines/reference/for-of31.errors.txt |  3 +-
 .../reference/functionOverloads41.errors.txt  |  1 +
 tests/baselines/reference/fuzzy.errors.txt    |  2 ++
 .../reference/generatorTypeCheck18.errors.txt |  1 +
 .../reference/generatorTypeCheck20.errors.txt |  1 +
 .../reference/generatorTypeCheck25.errors.txt |  1 +
 .../reference/generatorTypeCheck7.errors.txt  |  3 +-
 ...thObjectTypeArgsAndConstraints3.errors.txt |  1 +
 ...thObjectTypeArgsAndConstraints4.errors.txt |  1 +
 ...thObjectTypeArgsAndConstraints5.errors.txt |  1 +
 .../reference/genericConstraint2.errors.txt   |  4 ++-
 .../genericTypeAssertions2.errors.txt         |  4 ++-
 .../genericTypeConstraints.errors.txt         |  1 +
 .../baselines/reference/generics1.errors.txt  |  1 +
 .../baselines/reference/generics2.errors.txt  |  1 +
 .../baselines/reference/generics5.errors.txt  |  1 +
 ...rfaceExtendingClassWithPrivates.errors.txt |  1 +
 ...faceExtendingClassWithPrivates2.errors.txt |  5 ++++
 ...aceExtendingClassWithProtecteds.errors.txt |  2 ++
 ...tCallExpressionCheckReturntype1.errors.txt |  2 ++
 .../reference/inheritance1.errors.txt         | 14 ++++++++-
 ...sxFactoryDeclarationsLocalTypes.errors.txt |  3 ++
 ...xFactoryLocalTypeGlobalFallback.errors.txt |  1 +
 .../interfaceAssignmentCompat.errors.txt      |  1 +
 .../interfaceDeclaration1.errors.txt          |  1 +
 .../interfaceDeclaration4.errors.txt          |  2 ++
 ...terfaceExtendsClassWithPrivate1.errors.txt |  2 ++
 .../interfaceImplementation2.errors.txt       |  1 +
 .../interfaceImplementation3.errors.txt       |  1 +
 .../interfaceImplementation4.errors.txt       |  1 +
 .../interfaceImplementation6.errors.txt       |  1 +
 .../intersectionAndUnionTypes.errors.txt      | 11 +++++++
 .../intersectionTypeAssignment.errors.txt     |  4 +++
 .../invalidReturnStatements.errors.txt        |  1 +
 ...nvariantGenericErrorElaboration.errors.txt |  1 +
 .../iterableArrayPattern17.errors.txt         |  3 +-
 .../iteratorSpreadInArray9.errors.txt         |  3 +-
 .../reference/jsdocFunctionType.errors.txt    |  1 +
 .../reference/jsdocTemplateTag3.errors.txt    |  1 +
 .../reference/jsdocTypeTagCast.errors.txt     |  3 ++
 .../reference/mappedTypeErrors.errors.txt     |  1 +
 .../reference/mappedTypes6.errors.txt         |  2 ++
 ...nterfacesWithInheritedPrivates2.errors.txt |  1 +
 ...wingGenericTypeFromInstanceof01.errors.txt |  1 +
 .../nonIterableRestElement3.errors.txt        |  3 +-
 .../nonPrimitiveAssignError.errors.txt        |  1 +
 ...eralFunctionArgContextualTyping.errors.txt |  2 ++
 ...ralFunctionArgContextualTyping2.errors.txt |  1 +
 .../objectLiteralIndexerErrors.errors.txt     |  1 +
 .../objectLiteralNormalization.errors.txt     |  1 +
 ...handPropertiesFunctionArgument2.errors.txt |  1 +
 .../reference/objectSpreadNegative.errors.txt |  2 ++
 ...bjectTypesIdentityWithPrivates3.errors.txt |  3 +-
 .../optionalPropertiesInClasses.errors.txt    |  1 +
 .../optionalPropertiesTest.errors.txt         |  3 ++
 .../overloadingOnConstants1.errors.txt        |  6 +++-
 ...nWithConstraintCheckingDeferred.errors.txt |  2 ++
 .../overloadsWithProvisionalErrors.errors.txt |  1 +
 .../reference/promisePermutations.errors.txt  |  1 +
 .../reference/promisePermutations2.errors.txt |  1 +
 .../reference/promisePermutations3.errors.txt |  2 ++
 .../promisesWithConstraints.errors.txt        |  1 +
 tests/baselines/reference/qualify.errors.txt  |  3 ++
 .../recursiveClassReferenceTest.errors.txt    |  1 +
 .../recursiveInheritance3.errors.txt          |  1 +
 .../recursiveIntersectionTypes.errors.txt     |  1 +
 .../requireOfJsonFileInJsFile.errors.txt      |  2 ++
 ...cMemberOfAnotherClassAssignment.errors.txt |  4 +++
 .../strictFunctionTypesErrors.errors.txt      |  1 +
 ...ConstrainsPropertyDeclarations2.errors.txt |  2 ++
 .../subtypingWithNumericIndexer2.errors.txt   |  1 +
 .../subtypingWithNumericIndexer3.errors.txt   |  1 +
 .../subtypingWithNumericIndexer4.errors.txt   |  1 +
 .../subtypingWithNumericIndexer5.errors.txt   |  1 +
 .../subtypingWithObjectMembers3.errors.txt    |  1 +
 .../subtypingWithObjectMembers5.errors.txt    |  3 ++
 .../subtypingWithStringIndexer2.errors.txt    |  1 +
 .../subtypingWithStringIndexer3.errors.txt    |  1 +
 .../subtypingWithStringIndexer4.errors.txt    |  1 +
 .../reference/symbolProperty10.errors.txt     |  3 +-
 .../reference/symbolProperty25.errors.txt     |  1 +
 .../reference/symbolProperty52.errors.txt     |  1 +
 .../reference/symbolProperty9.errors.txt      |  3 +-
 ...eStringsWithOverloadResolution1.errors.txt |  1 +
 ...ingsWithOverloadResolution1_ES6.errors.txt |  1 +
 .../thisTypeInFunctionsNegative.errors.txt    |  3 ++
 .../tsxAttributeResolution1.errors.txt        |  1 +
 .../tsxAttributeResolution12.errors.txt       |  2 ++
 .../tsxAttributeResolution3.errors.txt        |  1 +
 .../tsxAttributeResolution5.errors.txt        |  2 ++
 .../tsxAttributeResolution6.errors.txt        |  1 +
 .../tsxInvokeComponentType.errors.txt         |  1 +
 ...tsxSpreadAttributesResolution16.errors.txt |  1 +
 .../tsxSpreadAttributesResolution6.errors.txt |  1 +
 ...elessFunctionComponentOverload4.errors.txt |  2 ++
 ...tsxStatelessFunctionComponents1.errors.txt |  1 +
 ...ionComponentsWithTypeArguments4.errors.txt |  2 ++
 .../reference/tsxUnionElementType6.errors.txt |  2 ++
 ...ntInferenceWithClassExpression2.errors.txt |  3 +-
 ...renceWithConstraintAsCommonRoot.errors.txt |  3 +-
 .../reference/typeAssertions.errors.txt       |  3 ++
 ...sertionsWithIntersectionTypes01.errors.txt |  1 +
 .../typeGuardFunctionErrors.errors.txt        |  2 ++
 ...peGuardFunctionOfFormThisErrors.errors.txt |  2 ++
 .../baselines/reference/typeMatch1.errors.txt |  1 +
 .../baselines/reference/typeMatch2.errors.txt |  3 ++
 .../typeParamExtendsOtherTypeParam.errors.txt |  5 ++++
 ...gWithContextSensitiveArguments2.errors.txt |  1 +
 ...gWithContextSensitiveArguments3.errors.txt |  1 +
 .../typedefMultipleTypeParameters.errors.txt  |  2 ++
 .../typeofInternalModules.errors.txt          |  2 ++
 .../types.asyncGenerators.esnext.2.errors.txt |  2 ++
 ...yExternalModuleStillHasInstance.errors.txt |  1 +
 ...unionTypeErrorMessageTypeRefs01.errors.txt |  3 ++
 ...eWithRecursiveSubtypeReduction2.errors.txt |  2 ++
 .../unionTypesAssignability.errors.txt        |  4 +++
 176 files changed, 390 insertions(+), 22 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 762a7f09b5043..deaa439b5359f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11310,6 +11310,7 @@ namespace ts {
         ): boolean {
 
             let errorInfo: DiagnosticMessageChain | undefined;
+            let relatedInfo: [DiagnosticRelatedInformation, ...DiagnosticRelatedInformation[]] | undefined;
             let maybeKeys: string[];
             let sourceStack: Type[];
             let targetStack: Type[];
@@ -11348,6 +11349,9 @@ namespace ts {
                 }
 
                 const diag = createDiagnosticForNodeFromMessageChain(errorNode!, errorInfo, relatedInformation);
+                if (relatedInfo) {
+                    addRelatedInfo(diag, ...relatedInfo);
+                }
                 if (errorOutputContainer) {
                     errorOutputContainer.error = diag;
                 }
@@ -11360,6 +11364,16 @@ namespace ts {
                 errorInfo = chainDiagnosticMessages(errorInfo, message, arg0, arg1, arg2, arg3);
             }
 
+            function associateRelatedInfo(info: DiagnosticRelatedInformation) {
+                Debug.assert(!!errorInfo);
+                if (!relatedInfo) {
+                    relatedInfo = [info];
+                }
+                else {
+                    relatedInfo.push(info);
+                }
+            }
+
             function reportRelationError(message: DiagnosticMessage | undefined, source: Type, target: Type) {
                 let sourceType = typeToString(source);
                 let targetType = typeToString(target);
@@ -12223,7 +12237,11 @@ namespace ts {
                             suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
-                            reportError(Diagnostics.Property_0_is_missing_in_type_1_but_present_in_type_2, symbolToString(unmatchedProperty), typeToString(source), typeToString(target));
+                            const propName = symbolToString(unmatchedProperty);
+                            reportError(Diagnostics.Property_0_is_missing_in_type_1_but_present_in_type_2, propName, typeToString(source), typeToString(target));
+                            if (unmatchedProperty.declarations[0]) {
+                                associateRelatedInfo(createDiagnosticForNode(unmatchedProperty.declarations[0], Diagnostics._0_is_declared_here, propName));
+                            }
                         }
                         else if (props.length > 5) { // arbitrary cutoff for too-long list form
                             reportError(Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), map(props.slice(0, 4), p => symbolToString(p)).join(", "), props.length - 4);
diff --git a/tests/baselines/reference/arrayAssignmentTest1.errors.txt b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
index e09feebceeaff..f885d53a47d71 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest1.errors.txt
@@ -77,6 +77,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is m
     var i1_error: I1 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2737: Property 'IM1' is missing in type 'undefined[]' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:2:2: 'IM1' is declared here.
     var c1_error: C1 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2735: Type 'undefined[]' is missing the following properties from type 'C1': IM1, C1M1
@@ -86,6 +87,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is m
     var c3_error: C3 = []; // should be an error - is
         ~~~~~~~~
 !!! error TS2737: Property 'CM3M1' is missing in type 'undefined[]' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:14:5: 'CM3M1' is declared here.
     
     
     arr_any = arr_i1; // should be ok - is
@@ -100,6 +102,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is m
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'I1[]'.
 !!! error TS2322:   Property 'IM1' is missing in type 'C3' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:2:2: 'IM1' is declared here.
     
     arr_c1 = arr_c1; // should be ok - subtype relationship - is
     arr_c1 = arr_c2; // should be ok - subtype relationship - is
@@ -107,6 +110,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is m
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C1[]'.
 !!! error TS2322:   Property 'C1M1' is missing in type 'I1' but present in type 'C1'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:7:2: 'C1M1' is declared here.
     arr_c1 = arr_c3; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C3[]' is not assignable to type 'C1[]'.
@@ -117,6 +121,7 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is m
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C2[]'.
 !!! error TS2322:   Property 'C2M1' is missing in type 'C1' but present in type 'C2'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:10:5: 'C2M1' is declared here.
     arr_c2 = arr_i1; // should be an error - subtype relationship - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C2[]'.
@@ -133,14 +138,17 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2736: Type 'I1' is m
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:14:5: 'CM3M1' is declared here.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:14:5: 'CM3M1' is declared here.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest1.ts:14:5: 'CM3M1' is declared here.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
diff --git a/tests/baselines/reference/arrayAssignmentTest2.errors.txt b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
index 6093b36b6da92..aaa4bae3e0f02 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest2.errors.txt
@@ -64,14 +64,17 @@ tests/cases/compiler/arrayAssignmentTest2.ts(58,1): error TS2736: Type 'I1' is m
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Property 'CM3M1' is missing in type 'C2' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest2.ts:14:2: 'CM3M1' is declared here.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Property 'CM3M1' is missing in type 'C1' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest2.ts:14:2: 'CM3M1' is declared here.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Property 'CM3M1' is missing in type 'I1' but present in type 'C3'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest2.ts:14:2: 'CM3M1' is declared here.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~
diff --git a/tests/baselines/reference/arrayAssignmentTest5.errors.txt b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
index 75b515387ac76..3a8503652af31 100644
--- a/tests/baselines/reference/arrayAssignmentTest5.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest5.errors.txt
@@ -29,6 +29,7 @@ tests/cases/compiler/arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[
                     ~~~~~~
 !!! error TS2322: Type 'IToken[]' is not assignable to type 'IStateToken[]'.
 !!! error TS2322:   Property 'state' is missing in type 'IToken' but present in type 'IStateToken'.
+!!! related TS2728 tests/cases/compiler/arrayAssignmentTest5.ts:8:9: 'state' is declared here.
                 if (tokens.length === 0) {
                     return this.onEnter(line, tokens, offset);        // <== this should produce an error since onEnter can not be called with (string, IStateToken[], offset)
                 }
diff --git a/tests/baselines/reference/arrayFrom.errors.txt b/tests/baselines/reference/arrayFrom.errors.txt
index 0325f5ad74aec..93f91a06a4110 100644
--- a/tests/baselines/reference/arrayFrom.errors.txt
+++ b/tests/baselines/reference/arrayFrom.errors.txt
@@ -27,6 +27,7 @@ tests/cases/compiler/arrayFrom.ts(23,7): error TS2322: Type 'A[]' is not assigna
           ~~~~~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
 !!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/arrayFrom.ts:9:3: 'b' is declared here.
     const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
     const result5: A[] = Array.from(inputALike);
     const result6: B[] = Array.from(inputALike); // expect error
diff --git a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
index e38b35538fb29..3ebb8a7cc7ed9 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt
@@ -24,6 +24,7 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
     ~~~
 !!! error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
 !!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts:2:21: 'b' is declared here.
     
     rra = cra;
     rra = crb; // OK, C<B> is assignable to ReadonlyArray<A>
diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
index 202ca7257aca0..79c649ec5fbc5 100644
--- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
+++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
@@ -12,7 +12,9 @@ tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS273
     fn((a, b) => true);
        ~~~~~~~~~~~~~~
 !!! error TS2737: Property 'x' is missing in type '(a: any, b: any) => boolean' but present in type 'IResultCallback'.
+!!! related TS2728 tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts:2:5: 'x' is declared here.
     fn(function (a, b) { return true; })
        ~~~~~~~~
 !!! error TS2737: Property 'x' is missing in type '(a: any, b: any) => boolean' but present in type 'IResultCallback'.
+!!! related TS2728 tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts:2:5: 'x' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompat1.errors.txt b/tests/baselines/reference/assignmentCompat1.errors.txt
index aafaadf62770a..c73f230948a01 100644
--- a/tests/baselines/reference/assignmentCompat1.errors.txt
+++ b/tests/baselines/reference/assignmentCompat1.errors.txt
@@ -11,10 +11,12 @@ tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'false' is n
     x = y;  // Error
     ~
 !!! error TS2737: Property 'one' is missing in type '{ [index: string]: any; }' but present in type '{ one: number; }'.
+!!! related TS2728 tests/cases/compiler/assignmentCompat1.ts:1:11: 'one' is declared here.
     y = x;  // Ok because index signature type is any
     x = z;  // Error
     ~
 !!! error TS2737: Property 'one' is missing in type '{ [index: number]: any; }' but present in type '{ one: number; }'.
+!!! related TS2728 tests/cases/compiler/assignmentCompat1.ts:1:11: 'one' is declared here.
     z = x;  // Ok because index signature type is any
     y = "foo"; // Error
     ~
diff --git a/tests/baselines/reference/assignmentCompatBug2.errors.txt b/tests/baselines/reference/assignmentCompatBug2.errors.txt
index ffd1b244a0cc9..e0e4439df749e 100644
--- a/tests/baselines/reference/assignmentCompatBug2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBug2.errors.txt
@@ -36,6 +36,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2737: Property 'm' i
     b3 = {
     ~~
 !!! error TS2737: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatBug2.ts:7:55: 'm' is declared here.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
     }; // error
@@ -43,6 +44,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2737: Property 'm' i
     b3 = {
     ~~
 !!! error TS2737: Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatBug2.ts:7:33: 'g' is declared here.
         f: (n) => { return 0; },
         m: 0,
     }; // error
@@ -58,6 +60,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2737: Property 'm' i
     b3 = {
     ~~
 !!! error TS2737: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but present in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatBug2.ts:7:55: 'm' is declared here.
         f: (n) => { return 0; },
         g: (s) => { return 0; },
         n: 0,
diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
index 234aaca931bed..e44a47df8e06c 100644
--- a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
+++ b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
@@ -15,4 +15,5 @@ tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS
 !!! related TS6500 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts:1:31: The expected type comes from property 'name' which is declared here on type '{ id: number; name?: string; }'
     foo({ name: "hello" });            // Error, id required but missing
         ~~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type '{ id: number; name?: string; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type '{ id: number; name?: string; }'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts:1:19: 'id' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
index a87f2a17a0df4..2e636bd38f5ad 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
@@ -62,15 +62,19 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = () => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '() => number' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:4:5: 'f' is declared here.
     t = function (x: number) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:4:5: 'f' is declared here.
     a = () => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '() => number' but present in type '{ f(x: number): void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:7:10: 'f' is declared here.
     a = function (x: number) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type '{ f(x: number): void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:7:10: 'f' is declared here.
     
     interface S2 {
         f(x: string): void;
@@ -95,9 +99,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = (x: string) => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:4:5: 'f' is declared here.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:4:5: 'f' is declared here.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f(x: number): void; }'.
@@ -115,7 +121,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     a = (x: string) => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type '{ f(x: number): void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:7:10: 'f' is declared here.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type '{ f(x: number): void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts:7:10: 'f' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
index 157c60739fda2..6ec8010b3d05c 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
@@ -182,6 +182,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts:18:49: 'bar' is declared here.
     var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
index 5280675fb9bea..81ffc124eda98 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
@@ -50,15 +50,19 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = () => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '() => number' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:4:5: 'f' is declared here.
     t = function (x: number) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:4:5: 'f' is declared here.
     a = () => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '() => number' but present in type '{ f: new (x: number) => void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:7:10: 'f' is declared here.
     a = function (x: number) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: number) => string' but present in type '{ f: new (x: number) => void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:7:10: 'f' is declared here.
     
     interface S2 {
         f(x: string): void;
@@ -81,9 +85,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     t = (x: string) => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:4:5: 'f' is declared here.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:4:5: 'f' is declared here.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '{ f: new (x: number) => void; }'.
@@ -99,7 +105,9 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     a = (x: string) => 1;
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => number' but present in type '{ f: new (x: number) => void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:7:10: 'f' is declared here.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2737: Property 'f' is missing in type '(x: string) => string' but present in type '{ f: new (x: number) => void; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts:7:10: 'f' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
index 740bce752d71b..83946508d6c2f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
@@ -182,6 +182,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but present in type '{ foo: string; bar: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts:18:53: 'bar' is declared here.
     var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
index 9fbf4035d3add..612fc5787493e 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
@@ -39,6 +39,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts:4:34: 'bar' is declared here.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
index a09544b3c37c8..26a4e77e9842b 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
@@ -39,6 +39,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts:4:34: 'bar' is declared here.
     
     var b2: { [x: number]: Derived2; }
     a = b2;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
index e71a7a5b8600e..4a11c14a31bb5 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
@@ -28,6 +28,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '{ [x: number]: Base; }' is not assignable to type 'A'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts:4:34: 'bar' is declared here.
     b = a; // ok
     
     class B2 extends A {
@@ -41,6 +42,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts:5:38: 'baz' is declared here.
     
     module Generics {
         class A<T extends Derived> {
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
index 63b85c66c9b4d..cb512d54e9f84 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
@@ -80,11 +80,13 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'T' is not assignable to type 'S'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Property 'bar' is missing in type 'Derived2' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts:5:34: 'bar' is declared here.
         t = s; // error
         ~
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Property 'baz' is missing in type 'Derived' but present in type 'Derived2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts:6:35: 'baz' is declared here.
         s = s2; // ok
         s = a2; // ok
     
@@ -178,6 +180,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'S' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Property 'baz' is missing in type 'Base' but present in type 'Derived2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts:51:35: 'baz' is declared here.
         s = s2; // ok
         s = a2; // ok
     
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
index fe4cce9b929f3..fb5e792f85a52 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
@@ -18,6 +18,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     c = i; // error
     ~
 !!! error TS2737: Property 'foo' is missing in type 'I' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts:2:5: 'foo' is declared here.
     i = c; // error
     ~
-!!! error TS2737: Property 'fooo' is missing in type 'C' but present in type 'I'.
\ No newline at end of file
+!!! error TS2737: Property 'fooo' is missing in type 'C' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts:8:5: 'fooo' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
index a7398540b050f..974f8e96739d5 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
@@ -113,34 +113,43 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         c = d; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'D' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:53:9: 'opt' is declared here.
         c = e; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'E' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:53:9: 'opt' is declared here.
         c = f; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'F' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:53:9: 'opt' is declared here.
         c = a; // ok
     
         a = d; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:57:14: 'opt' is declared here.
         a = e; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:57:14: 'opt' is declared here.
         a = f; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:57:14: 'opt' is declared here.
         a = c; // ok
     
         b = d; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'D' but present in type '{ opt: Base; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:58:15: 'opt' is declared here.
         b = e; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'E' but present in type '{ opt: Base; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:58:15: 'opt' is declared here.
         b = f; // error
         ~
 !!! error TS2737: Property 'opt' is missing in type 'F' but present in type '{ opt: Base; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts:58:15: 'opt' is declared here.
         b = a; // ok
         b = c; // ok
     }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
index d9323121cdc8e..5592dbda8e56e 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
@@ -53,57 +53,73 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = t;
         ~
 !!! error TS2737: Property ''1'' is missing in type 'T' but present in type 'S'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:5:15: ''1'' is declared here.
         t = s;
         ~
 !!! error TS2737: Property ''1.'' is missing in type 'S' but present in type 'T'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:6:15: ''1.'' is declared here.
         s = s2; // ok
         s = a2;
         ~
 !!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:5:15: ''1'' is declared here.
     
         s2 = t2;
         ~~
 !!! error TS2737: Property ''1'' is missing in type 'T2' but present in type 'S2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:10:20: ''1'' is declared here.
         t2 = s2;
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type 'S2' but present in type 'T2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:11:20: ''1.0'' is declared here.
         s2 = t;
         ~~
 !!! error TS2737: Property ''1'' is missing in type 'T' but present in type 'S2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:10:20: ''1'' is declared here.
         s2 = b;
         ~~
 !!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; baz?: string; }' but present in type 'S2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:10:20: ''1'' is declared here.
         s2 = a2;
         ~~
 !!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:10:20: ''1'' is declared here.
     
         a = b;
         ~
 !!! error TS2737: Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
         b = a;
         ~
 !!! error TS2737: Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ '1.0': string; baz?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:16:14: ''1.0'' is declared here.
         a = s;
         ~
 !!! error TS2737: Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
         a = s2;
         ~
 !!! error TS2737: Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
         a = a2;
         ~
 !!! error TS2737: Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
     
         a2 = b2;
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type '{ '1': string; }' but present in type '{ '1.0': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:18:16: ''1.0'' is declared here.
         b2 = a2;
         ~~
 !!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type '{ '1': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:19:16: ''1'' is declared here.
         a2 = b; // ok
         a2 = t2; // ok
         a2 = t;
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:18:16: ''1.0'' is declared here.
     }
     
     module NumbersAndStrings {
@@ -129,6 +145,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s = a2; // error
         ~
 !!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:46:15: ''1'' is declared here.
     
         s2 = t2; // ok
         t2 = s2; // ok
@@ -137,39 +154,51 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         s2 = a2; // error
         ~~
 !!! error TS2737: Property ''1'' is missing in type '{ '1.0': string; }' but present in type 'S2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:51:20: ''1'' is declared here.
     
         a = b; // error
         ~
 !!! error TS2737: Property ''1.'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
         b = a; // error
         ~
 !!! error TS2737: Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but present in type '{ 1.0: string; baz?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:57:14: '1.0' is declared here.
         a = s; // error
         ~
 !!! error TS2737: Property ''1.'' is missing in type 'S' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
         a = s2; // error
         ~
 !!! error TS2737: Property ''1.'' is missing in type 'S2' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
         a = a2; // error
         ~
 !!! error TS2737: Property ''1.'' is missing in type '{ '1.0': string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
         a = b2; // error
         ~
 !!! error TS2737: Property ''1.'' is missing in type '{ 1.: string; }' but present in type '{ '1.': string; bar?: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
     
         a2 = b2; // error
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type '{ 1.: string; }' but present in type '{ '1.0': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:59:16: ''1.0'' is declared here.
         b2 = a2; // error
         ~~
 !!! error TS2737: Property '1.' is missing in type '{ '1.0': string; }' but present in type '{ 1.: string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:60:16: '1.' is declared here.
         a2 = b; // error
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type '{ 1.0: string; baz?: string; }' but present in type '{ '1.0': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:59:16: ''1.0'' is declared here.
         a2 = t2; // error
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type 'T2' but present in type '{ '1.0': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:59:16: ''1.0'' is declared here.
         a2 = t; // error
         ~~
 !!! error TS2737: Property ''1.0'' is missing in type 'T' but present in type '{ '1.0': string; }'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts:59:16: ''1.0'' is declared here.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
index 992e29a0bd1f1..e72350d525256 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
@@ -46,6 +46,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts:4:34: 'bar' is declared here.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
index f1971814b20d6..b53a4a50996d7 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
@@ -46,6 +46,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'A' is not assignable to type '{ [x: string]: Derived; }'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts:4:34: 'bar' is declared here.
     
     var b2: { [x: string]: Derived2; }
     a = b2; // ok
diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
index 97a4ae9805bd2..a8a135c454dd2 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
@@ -24,12 +24,14 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
     x = [''];
     ~
 !!! error TS2737: Property 'apply' is missing in type 'string[]' but present in type 'Applicable'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts:4:5: 'apply' is declared here.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Applicable'.
     x = {};
     ~
 !!! error TS2737: Property 'apply' is missing in type '{}' but present in type 'Applicable'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts:4:5: 'apply' is declared here.
     
     // Should work
     function f() { };
@@ -50,6 +52,7 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
     fn({});
        ~~
 !!! error TS2737: Property 'apply' is missing in type '{}' but present in type 'Applicable'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts:4:5: 'apply' is declared here.
     
     
     // Should work
diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
index 97d74cf93ba8a..33b41f3991376 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
@@ -24,12 +24,14 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
     x = [''];
     ~
 !!! error TS2737: Property 'call' is missing in type 'string[]' but present in type 'Callable'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts:4:5: 'call' is declared here.
     x = 4;
     ~
 !!! error TS2322: Type '4' is not assignable to type 'Callable'.
     x = {};
     ~
 !!! error TS2737: Property 'call' is missing in type '{}' but present in type 'Callable'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts:4:5: 'call' is declared here.
     
     // Should work
     function f() { };
@@ -50,6 +52,7 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
     fn({});
        ~~
 !!! error TS2737: Property 'call' is missing in type '{}' but present in type 'Callable'.
+!!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts:4:5: 'call' is declared here.
     
     
     // Should work
diff --git a/tests/baselines/reference/bases.errors.txt b/tests/baselines/reference/bases.errors.txt
index 135241aa3d8de..e04fca1a519b7 100644
--- a/tests/baselines/reference/bases.errors.txt
+++ b/tests/baselines/reference/bases.errors.txt
@@ -33,6 +33,7 @@ tests/cases/compiler/bases.ts(18,9): error TS2339: Property 'y' does not exist o
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'x' is missing in type 'C' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/bases.ts:2:5: 'x' is declared here.
         constructor() {
         ~~~~~~~~~~~~~~~
             this.x: any;
diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt
index 49226e2eff2bc..18f42205f93da 100644
--- a/tests/baselines/reference/bluebirdStaticThis.errors.txt
+++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt
@@ -16,6 +16,7 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace '"tes
                          ~~~~~~~
 !!! error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
 !!! error TS2420:   Property 'then' is missing in type 'Promise<R>' but present in type 'Thenable<R>'.
+!!! related TS2728 tests/cases/compiler/bluebirdStaticThis.ts:113:3: 'then' is declared here.
     	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
         static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
         static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
diff --git a/tests/baselines/reference/chainedAssignment1.errors.txt b/tests/baselines/reference/chainedAssignment1.errors.txt
index 87c051b51f2e6..3c88e8e691d09 100644
--- a/tests/baselines/reference/chainedAssignment1.errors.txt
+++ b/tests/baselines/reference/chainedAssignment1.errors.txt
@@ -27,6 +27,7 @@ tests/cases/compiler/chainedAssignment1.ts(22,1): error TS2322: Type 'Z' is not
     c1 = c2 = c3; // a bug made this not report the same error as below
     ~~
 !!! error TS2737: Property 'a' is missing in type 'Z' but present in type 'X'.
+!!! related TS2728 tests/cases/compiler/chainedAssignment1.ts:3:5: 'a' is declared here.
          ~~
 !!! error TS2735: Type 'Z' is missing the following properties from type 'Y': a, b
     c2 = c3; // Error TS111: Cannot convert Z to Y
diff --git a/tests/baselines/reference/chainedAssignment3.errors.txt b/tests/baselines/reference/chainedAssignment3.errors.txt
index 18b6b8b7c7dae..e41db3da9f313 100644
--- a/tests/baselines/reference/chainedAssignment3.errors.txt
+++ b/tests/baselines/reference/chainedAssignment3.errors.txt
@@ -23,6 +23,7 @@ tests/cases/compiler/chainedAssignment3.ts(19,5): error TS2322: Type 'A' is not
     b = a = new A();
     ~
 !!! error TS2737: Property 'value' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/chainedAssignment3.ts:6:5: 'value' is declared here.
     a = b = new A();
         ~
 !!! error TS2322: Type 'A' is not assignable to type 'B'.
diff --git a/tests/baselines/reference/chainedAssignmentChecking.errors.txt b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
index 6e7acc3816ae4..34f25307bcf5c 100644
--- a/tests/baselines/reference/chainedAssignmentChecking.errors.txt
+++ b/tests/baselines/reference/chainedAssignmentChecking.errors.txt
@@ -26,6 +26,7 @@ tests/cases/compiler/chainedAssignmentChecking.ts(21,6): error TS2735: Type 'Z'
     c1 = c2 = c3; // Should be error
     ~~
 !!! error TS2737: Property 'a' is missing in type 'Z' but present in type 'X'.
+!!! related TS2728 tests/cases/compiler/chainedAssignmentChecking.ts:3:3: 'a' is declared here.
          ~~
 !!! error TS2735: Type 'Z' is missing the following properties from type 'Y': a, b
     
\ No newline at end of file
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
index fe7ab53a844c9..d02ceba6ba7e2 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt
@@ -23,4 +23,5 @@ tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParamete
     (new Chain(new A)).then(a => new B).then(b => new C).then(c => new B).then(b => new A);
                                                                    ~~~~~
 !!! error TS2737: Property 'z' is missing in type 'B' but present in type 'C'.
+!!! related TS2728 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts:15:5: 'z' is declared here.
 !!! 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/checkJsdocTypeTag6.errors.txt b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
index 65d5002e46bea..457971aeb813b 100644
--- a/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
+++ b/tests/baselines/reference/checkJsdocTypeTag6.errors.txt
@@ -15,6 +15,7 @@ tests/cases/conformance/jsdoc/test.js(10,5): error TS8030: The type of a functio
     var g = function (prop) {
         ~
 !!! error TS2737: Property 'prop' is missing in type '(prop: any) => void' but present in type '{ prop: string; }'.
+!!! related TS2728 tests/cases/conformance/jsdoc/test.js:6:14: 'prop' is declared here.
     }
     
     /** @type {(a: number) => number} */
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
index 2c74914f62592..a27049b279e88 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
@@ -35,6 +35,7 @@ tests/cases/conformance/jsx/file.tsx(49,6): error TS2322: Type '{ children: Elem
     let k = <Comp a={10} b="hi" />;
              ~~~~
 !!! error TS2737: Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:6:5: 'children' is declared here.
     
     let k0 =
         <Comp a={10} b="hi" children="Random" >
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
index d2c2f8239a66d..bcd8f0ff323a4 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
@@ -30,6 +30,7 @@ tests/cases/conformance/jsx/file.tsx(28,6): error TS2322: Type '{ children: type
     let k = <Comp a={10} b="hi" />;
              ~~~~
 !!! error TS2737: Property 'children' is missing in type '{ a: number; b: string; }' but present in type 'Prop'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:6:5: 'children' is declared here.
     
     // Error: JSX.element is not the same as JSX.ElementClass
     let k1 =
diff --git a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
index cd554ae82488c..9ab3e83b9ab31 100644
--- a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
+++ b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
@@ -97,6 +97,7 @@ tests/cases/conformance/salsa/second.ts(17,15): error TS2345: Argument of type '
 !!! error TS2417:       Types of parameters 'others' and 'wagons' are incompatible.
 !!! error TS2417:         Type 'Wagon[]' is not assignable to type '(typeof Wagon)[]'.
 !!! error TS2417:           Property 'circle' is missing in type 'Wagon' but present in type 'typeof Wagon'.
+!!! related TS2728 tests/cases/conformance/salsa/first.js:9:1: 'circle' is declared here.
         constructor(public drunkOO: true) {
             // error: wrong type
             super('nope');
diff --git a/tests/baselines/reference/classImplementsClass2.errors.txt b/tests/baselines/reference/classImplementsClass2.errors.txt
index 3e900e123552c..97cb621f26ce6 100644
--- a/tests/baselines/reference/classImplementsClass2.errors.txt
+++ b/tests/baselines/reference/classImplementsClass2.errors.txt
@@ -9,6 +9,7 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2737: Property 'foo
           ~
 !!! error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
 !!! error TS2720:   Property 'foo' is missing in type 'C' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/classImplementsClass2.ts:1:11: 'foo' is declared here.
     
     class C2 extends A {
         foo() {
@@ -21,4 +22,5 @@ tests/cases/compiler/classImplementsClass2.ts(13,1): error TS2737: Property 'foo
     c = c2;
     c2 = c;
     ~~
-!!! error TS2737: Property 'foo' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
+!!! error TS2737: Property 'foo' is missing in type 'C' but present in type 'C2'.
+!!! related TS2728 tests/cases/compiler/classImplementsClass2.ts:5:5: 'foo' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass4.errors.txt b/tests/baselines/reference/classImplementsClass4.errors.txt
index 0a11439298921..cf8d99a8f83e2 100644
--- a/tests/baselines/reference/classImplementsClass4.errors.txt
+++ b/tests/baselines/reference/classImplementsClass4.errors.txt
@@ -12,6 +12,7 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2737: Property 'x'
           ~
 !!! error TS2720: Class 'C' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
 !!! error TS2720:   Property 'x' is missing in type 'C' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/classImplementsClass4.ts:2:13: 'x' is declared here.
         foo() {
             return 1;
         }
@@ -24,4 +25,5 @@ tests/cases/compiler/classImplementsClass4.ts(16,1): error TS2737: Property 'x'
     c = c2;
     c2 = c;
     ~~
-!!! error TS2737: Property 'x' is missing in type 'C' but present in type 'C2'.
\ No newline at end of file
+!!! error TS2737: Property 'x' is missing in type 'C' but present in type 'C2'.
+!!! related TS2728 tests/cases/compiler/classImplementsClass4.ts:2:13: 'x' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsClass7.errors.txt b/tests/baselines/reference/classImplementsClass7.errors.txt
index dd2eb366fe4da..ade89c45e7880 100644
--- a/tests/baselines/reference/classImplementsClass7.errors.txt
+++ b/tests/baselines/reference/classImplementsClass7.errors.txt
@@ -11,4 +11,5 @@ tests/cases/compiler/classImplementsClass7.ts(5,7): error TS2720: Class 'B' inco
           ~
 !!! error TS2720: Class 'B' incorrectly implements class 'A'. Did you mean to extend 'A' and inherit its members as a subclass?
 !!! error TS2720:   Property 'x' is missing in type 'B' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/classImplementsClass7.ts:2:13: 'x' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
index 1275ca401443e..764b229e0817f 100644
--- a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
@@ -25,6 +25,7 @@ tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInte
           ~~
 !!! error TS2720: Class 'C3' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
 !!! error TS2720:   Property 'y' is missing in type 'C3' but present in type 'C1'.
+!!! related TS2728 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts:6:5: 'y' is declared here.
         x : number;
     }
     
@@ -32,6 +33,7 @@ tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInte
           ~~
 !!! error TS2720: Class 'C4' incorrectly implements class 'C1'. Did you mean to extend 'C1' and inherit its members as a subclass?
 !!! error TS2720:   Property 'x' is missing in type 'C4' but present in type 'C1'.
+!!! related TS2728 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts:2:5: 'x' is declared here.
         y : number;
     }
     
diff --git a/tests/baselines/reference/clodulesDerivedClasses.errors.txt b/tests/baselines/reference/clodulesDerivedClasses.errors.txt
index dbc78d618535a..5818a3291b8a2 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.errors.txt
+++ b/tests/baselines/reference/clodulesDerivedClasses.errors.txt
@@ -17,6 +17,7 @@ tests/cases/compiler/clodulesDerivedClasses.ts(9,7): error TS2417: Class static
 !!! error TS2417: Class static side 'typeof Path' incorrectly extends base class static side 'typeof Shape'.
 !!! error TS2417:   Types of property 'Utils' are incompatible.
 !!! error TS2417:     Property 'convert' is missing in type 'typeof Utils' but present in type 'typeof Utils'.
+!!! related TS2728 tests/cases/compiler/clodulesDerivedClasses.ts:6:21: 'convert' is declared here.
         name: string;
     
     }
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
index 6648da249b8f0..1d06a772566f1 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
@@ -32,10 +32,12 @@ tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithou
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'A'.
 !!! error TS2322:   Property 'propertyA' is missing in type 'B' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts:3:21: 'propertyA' is declared here.
     var result3: B = true ? a : b;
         ~~~~~~~
 !!! error TS2322: Type 'A | B' is not assignable to type 'B'.
 !!! error TS2322:   Property 'propertyB' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts:4:21: 'propertyB' is declared here.
     var result31: A | B = true ? a : b;
     
     var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt
index f421eea882a0d..60dcea674e1cf 100644
--- a/tests/baselines/reference/conditionalTypes2.errors.txt
+++ b/tests/baselines/reference/conditionalTypes2.errors.txt
@@ -120,10 +120,13 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2
 !!! error TS2345:   Property 'bat' is missing in type 'Bar & Foo' but present in type '{ foo: string; bat: string; }'.
 !!! error TS2345:     Type 'Extract<Foo & T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
 !!! error TS2345:       Property 'bat' is missing in type 'Bar & Foo' but present in type '{ foo: string; bat: string; }'.
+!!! related TS2728 tests/cases/conformance/types/conditional/conditionalTypes2.ts:62:43: 'bat' is declared here.
+!!! related TS2728 tests/cases/conformance/types/conditional/conditionalTypes2.ts:62:43: 'bat' is declared here.
         fooBat(y);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract<T, Foo & Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
 !!! error TS2345:   Property 'bat' is missing in type 'Foo & Bar' but present in type '{ foo: string; bat: string; }'.
+!!! related TS2728 tests/cases/conformance/types/conditional/conditionalTypes2.ts:62:43: 'bat' is declared here.
         fooBat(z);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract2<T, Foo, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
diff --git a/tests/baselines/reference/constraints0.errors.txt b/tests/baselines/reference/constraints0.errors.txt
index cb9b356024d8d..8c1f4e2f7ab2c 100644
--- a/tests/baselines/reference/constraints0.errors.txt
+++ b/tests/baselines/reference/constraints0.errors.txt
@@ -18,5 +18,6 @@ tests/cases/compiler/constraints0.ts(14,11): error TS2737: Property 'a' is missi
     var v2: C<B>; // should not work
               ~
 !!! error TS2737: Property 'a' is missing in type 'B' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/constraints0.ts:2:2: 'a' is declared here.
     
     var y = v1.x.a; // 'a' should be of type 'number'
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
index 869f8abce51ae..1fbadcb859ddf 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
@@ -16,6 +16,7 @@ tests/cases/compiler/contextualSignatureInstatiationContravariance.ts(8,1): erro
 !!! error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
 !!! error TS2322:   Types of parameters 'y' and 'e' are incompatible.
 !!! error TS2322:     Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
+!!! related TS2728 tests/cases/compiler/contextualSignatureInstatiationContravariance.ts:2:36: 'y' is declared here.
     
     var h2: (g1: Giraffe, g2: Giraffe) => void;
     h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
index ab1b7e6352ee5..680ab6c5123e8 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
@@ -73,6 +73,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
         ~~~~~~~~~~~~
 !!! error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
 !!! error TS2322:   Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }' but present in type '{ prop: number; anotherP1: number; }'.
+!!! related TS2728 tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts:25:73: 'anotherP1' is declared here.
         prop: strOrNumber,
         anotherP: str
     };
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index ec7bc7c1bdc98..81d7b0af5d5ab 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -230,4 +230,5 @@ tests/cases/compiler/contextualTyping.ts(223,5): error TS2737: Property 'x' is m
     var x: B = { };
         ~
 !!! error TS2737: Property 'x' is missing in type '{}' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/contextualTyping.ts:221:15: 'x' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping11.errors.txt b/tests/baselines/reference/contextualTyping11.errors.txt
index 46d8fb06e0dbe..55ba0b04f5c94 100644
--- a/tests/baselines/reference/contextualTyping11.errors.txt
+++ b/tests/baselines/reference/contextualTyping11.errors.txt
@@ -4,4 +4,5 @@ tests/cases/compiler/contextualTyping11.ts(1,42): error TS2737: Property 'id' is
 ==== tests/cases/compiler/contextualTyping11.ts (1 errors) ====
     class foo { public bar:{id:number;}[] = [<foo>({})]; }
                                              ~~~~~~~~~
-!!! error TS2737: Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type 'foo' but present in type '{ id: number; }'.
+!!! related TS2728 tests/cases/compiler/contextualTyping11.ts:1:25: 'id' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping5.errors.txt b/tests/baselines/reference/contextualTyping5.errors.txt
index 730d9f6926e42..c543e340c840e 100644
--- a/tests/baselines/reference/contextualTyping5.errors.txt
+++ b/tests/baselines/reference/contextualTyping5.errors.txt
@@ -4,4 +4,5 @@ tests/cases/compiler/contextualTyping5.ts(1,20): error TS2737: Property 'id' is
 ==== tests/cases/compiler/contextualTyping5.ts (1 errors) ====
     class foo { public bar:{id:number;} = { }; }
                        ~~~
-!!! error TS2737: Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
\ No newline at end of file
+!!! error TS2737: Property 'id' is missing in type '{}' but present in type '{ id: number; }'.
+!!! related TS2728 tests/cases/compiler/contextualTyping5.ts:1:25: 'id' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/covariantCallbacks.errors.txt b/tests/baselines/reference/covariantCallbacks.errors.txt
index c44e7fdc320f8..055d987f68599 100644
--- a/tests/baselines/reference/covariantCallbacks.errors.txt
+++ b/tests/baselines/reference/covariantCallbacks.errors.txt
@@ -41,6 +41,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covarian
         ~
 !!! error TS2322: Type 'P<A>' is not assignable to type 'P<B>'.
 !!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/covariantCallbacks.ts:8:25: 'b' is declared here.
     }
     
     function f2(a: Promise<A>, b: Promise<B>) {
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
index 099f6d8707755..d0547b21c7e90 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt
@@ -13,4 +13,5 @@ tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): e
     var a: D = foo("hi", []);
         ~
 !!! error TS2737: Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo' but present in type 'D'.
+!!! related TS2728 tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts:2:13: 'x' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
index 4d80ee6a638fe..001a3f43c5962 100644
--- a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
+++ b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt
@@ -3,6 +3,10 @@
 22                 thing: {}
                    ~~~~~
 
+  tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:2:5
+    2     a: number;
+          ~
+    'a' is declared here.
   tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17
     9                 thing: A;
                       ~~~~~
@@ -12,6 +16,10 @@
 25                 another: {}
                    ~~~~~~~
 
+  tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:2:5
+    2     a: number;
+          ~
+    'a' is declared here.
   tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17
     12                 another: A;
                        ~~~~~~~
@@ -43,12 +51,14 @@
                     thing: {}
                     ~~~~~
 !!! error TS2737: Property 'a' is missing in type '{}' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:2:5: 'a' is declared here.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17: The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
                 },
                 yetstill: {
                     another: {}
                     ~~~~~~~
 !!! error TS2737: Property 'a' is missing in type '{}' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:2:5: 'a' is declared here.
 !!! related TS6500 tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17: The expected type comes from property 'another' which is declared here on type '{ another: A; }'
                 }
             }
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
index 30d42471acc13..ed89e1f33275d 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
@@ -54,10 +54,12 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(
     d3({ y: new Class() });
          ~
 !!! error TS2737: Property 'foo' is missing in type 'Class' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:14:5: 'foo' is declared here.
 !!! related TS6500 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: The expected type comes from property 'y' which is declared here on type '{ y: D; }'
     d3({});
        ~~
 !!! error TS2737: Property 'y' is missing in type '{}' but present in type '{ y: D; }'.
+!!! related TS2728 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: 'y' is declared here.
     d3({ y: 1 });
          ~
 !!! error TS2322: Type 'number' is not assignable to type 'D'.
diff --git a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
index c167b833bd751..76d7a3ebc47c9 100644
--- a/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
+++ b/tests/baselines/reference/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.errors.txt
@@ -17,6 +17,7 @@ tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts(2
         x: Bar,
            ~~~
 !!! error TS2737: Property 'x' is missing in type 'typeof Bar' but present in type 'Bar'.
+!!! related TS2728 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:2:5: 'x' is declared here.
 !!! related TS6213 tests/cases/compiler/didYouMeanElaborationsForExpressionsWhichCouldBeCalled.ts:10:8: Did you mean to use 'new' with this expression?
         y: Date
            ~~~~
diff --git a/tests/baselines/reference/differentTypesWithSameName.errors.txt b/tests/baselines/reference/differentTypesWithSameName.errors.txt
index 3216182ff26f1..3eca5048607da 100644
--- a/tests/baselines/reference/differentTypesWithSameName.errors.txt
+++ b/tests/baselines/reference/differentTypesWithSameName.errors.txt
@@ -19,4 +19,5 @@ tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2737: Propert
     var v: variable = new variable();
     m.doSomething(v);
                   ~
-!!! error TS2737: Property 's' is missing in type 'variable' but present in type 'variable'.
\ No newline at end of file
+!!! error TS2737: Property 's' is missing in type 'variable' but present in type 'variable'.
+!!! related TS2728 tests/cases/compiler/differentTypesWithSameName.ts:3:5: 's' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/elaboratedErrors.errors.txt b/tests/baselines/reference/elaboratedErrors.errors.txt
index 82370a26ca76b..0c0a3100bc28b 100644
--- a/tests/baselines/reference/elaboratedErrors.errors.txt
+++ b/tests/baselines/reference/elaboratedErrors.errors.txt
@@ -32,6 +32,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     x = y;
     ~
 !!! error TS2737: Property 'x' is missing in type 'Beta' but present in type 'Alpha'.
+!!! related TS2728 tests/cases/compiler/elaboratedErrors.ts:14:19: 'x' is declared here.
     x = y;
     ~
 !!! error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
@@ -40,6 +41,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     y = x;
     ~
 !!! error TS2737: Property 'y' is missing in type 'Alpha' but present in type 'Beta'.
+!!! related TS2728 tests/cases/compiler/elaboratedErrors.ts:15:18: 'y' is declared here.
     y = x;
     ~
 !!! error TS2322: Type 'Alpha' is not assignable to type 'Beta'.
diff --git a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
index d38762a76b4d9..6ab545d573805 100644
--- a/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
+++ b/tests/baselines/reference/errorsWithInvokablesInUnions01.errors.txt
@@ -33,6 +33,7 @@ tests/cases/compiler/errorsWithInvokablesInUnions01.ts(16,12): error TS2322: Typ
 !!! error TS2322: Type 'typeof ctor' is not assignable to type 'ConstructableA | IDirectiveLinkFn<number> | IDirectivePrePost<number>'.
 !!! error TS2322:   Type 'typeof ctor' is not assignable to type 'ConstructableA'.
 !!! error TS2322:     Property 'somePropA' is missing in type 'ctor' but present in type '{ somePropA: any; }'.
+!!! related TS2728 tests/cases/compiler/errorsWithInvokablesInUnions01.ts:2:12: 'somePropA' is declared here.
         someUnaccountedProp: any;
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
index 5ad74fc964dc6..be75dfbf9dd4d 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
@@ -76,9 +76,11 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
     var anInterface: I = new D();
         ~~~~~~~~~~~
 !!! error TS2737: Property 'id' is missing in type 'D<{}>' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts:2:5: 'id' is declared here.
     var aClass: C = new D();
         ~~~~~~
 !!! error TS2737: Property 'id' is missing in type 'D<{}>' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts:6:5: 'id' is declared here.
     var aGenericClass: D<string> = new C();
         ~~~~~~~~~~~~~
 !!! error TS2735: Type 'C' is missing the following properties from type 'D<string>': source, recurse, wrapped
@@ -113,6 +115,7 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
 !!! error TS2322:   Types of property 'A' are incompatible.
 !!! error TS2322:     Type 'typeof N.A' is not assignable to type 'typeof M.A'.
 !!! error TS2322:       Property 'name' is missing in type 'A' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts:20:9: 'name' is declared here.
     var aClassInModule: M.A = new N.A();
         ~~~~~~~~~~~~~~
 !!! error TS2322: Type 'N.A' is not assignable to type 'M.A'.
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
index 5ba4ae0b54bc8..50e957c942c78 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
@@ -49,6 +49,7 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(66,9): error TS2322: Type
     ~~~~~
 !!! error TS2322: Type '{ tag: "D"; }' is not assignable to type 'ADT'.
 !!! error TS2322:   Property 'd20' is missing in type '{ tag: "D"; }' but present in type '{ tag: "D"; d20: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; }'.
+!!! related TS2728 tests/cases/compiler/excessPropertyCheckWithUnions.ts:6:5: 'd20' is declared here.
     
     type Ambiguous = {
         tag: "A",
diff --git a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
index c904ae15fa008..ddc41f424b32e 100644
--- a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
+++ b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
@@ -23,8 +23,10 @@ tests/cases/compiler/index.ts(12,6): error TS2737: Property 'foo' is missing in
     nFoo(q); // for comparison
          ~
 !!! error TS2737: Property 'foo' is missing in type '{ foob: string; }' but present in type 'IFoo'.
+!!! related TS2728 tests/cases/compiler/index.ts:4:5: 'foo' is declared here.
     
     nFoo(B);
          ~
 !!! error TS2737: Property 'foo' is missing in type '{ foob: string; }' but present in type 'IFoo'.
+!!! related TS2728 tests/cases/compiler/index.ts:4:5: 'foo' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
index 072748a4cf444..3f1dbf94203b1 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
@@ -15,6 +15,7 @@ tests/cases/compiler/fixingTypeParametersRepeatedly2.ts(11,32): error TS2737: Pr
     var result = foo(derived, d => d.toBase());
                                    ~~~~~~~~~~
 !!! error TS2737: Property 'toBase' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/compiler/fixingTypeParametersRepeatedly2.ts:5:5: 'toBase' is declared here.
 !!! 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.
diff --git a/tests/baselines/reference/for-of31.errors.txt b/tests/baselines/reference/for-of31.errors.txt
index e7ab90742776d..2b9aad7e44b81 100644
--- a/tests/baselines/reference/for-of31.errors.txt
+++ b/tests/baselines/reference/for-of31.errors.txt
@@ -29,4 +29,5 @@ tests/cases/conformance/es6/for-ofStatements/for-of31.ts(14,15): error TS2322: T
 !!! error TS2322:       Type 'StringIterator' is not assignable to type 'Iterator<string>'.
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: string; }' is not assignable to type '(value?: any) => IteratorResult<string>'.
-!!! error TS2322:             Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
\ No newline at end of file
+!!! error TS2322:             Property 'done' is missing in type '{ value: string; }' but present in type 'IteratorResult<string>'.
+!!! related TS2728 /.ts/lib.es2015.iterable.d.ts:32:5: 'done' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads41.errors.txt b/tests/baselines/reference/functionOverloads41.errors.txt
index 361bf6fd6b3fd..c4ab323c9ea92 100644
--- a/tests/baselines/reference/functionOverloads41.errors.txt
+++ b/tests/baselines/reference/functionOverloads41.errors.txt
@@ -8,4 +8,5 @@ tests/cases/compiler/functionOverloads41.ts(4,14): error TS2737: Property 'a' is
     var x = foo([{}]);
                  ~~
 !!! error TS2737: Property 'a' is missing in type '{}' but present in type '{ a: boolean; }'.
+!!! related TS2728 tests/cases/compiler/functionOverloads41.ts:2:19: 'a' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index fddbdfb571468..116eb5a0c1489 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -22,6 +22,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missi
                      ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'alsoWorks' is missing in type 'C' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/fuzzy.ts:4:9: 'alsoWorks' is declared here.
             constructor(public x:number) {
             }
             works():R {
@@ -40,6 +41,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2737: Property 'anything' is missi
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'anything' is missing in type '{ oneI: this; }' but present in type 'R'.
+!!! related TS2728 tests/cases/compiler/fuzzy.ts:9:9: 'anything' is declared here.
             }
         }
     }
diff --git a/tests/baselines/reference/generatorTypeCheck18.errors.txt b/tests/baselines/reference/generatorTypeCheck18.errors.txt
index 5018503e50e26..e96b1be196a98 100644
--- a/tests/baselines/reference/generatorTypeCheck18.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck18.errors.txt
@@ -9,4 +9,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts(5,11): erro
         yield new Baz;
               ~~~~~~~
 !!! error TS2737: Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+!!! related TS2728 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck18.ts:1:13: 'x' is declared here.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck20.errors.txt b/tests/baselines/reference/generatorTypeCheck20.errors.txt
index 234caf5bcb69f..e8f60b02c12d3 100644
--- a/tests/baselines/reference/generatorTypeCheck20.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck20.errors.txt
@@ -9,4 +9,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts(5,13): erro
         yield * [new Baz];
                 ~~~~~~~~~
 !!! error TS2737: Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+!!! related TS2728 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck20.ts:1:13: 'x' is declared here.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck25.errors.txt b/tests/baselines/reference/generatorTypeCheck25.errors.txt
index f4b8c43430d30..6fe4f013ab97f 100644
--- a/tests/baselines/reference/generatorTypeCheck25.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck25.errors.txt
@@ -26,6 +26,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts(4,5): error
 !!! error TS2322:               Type 'IteratorResult<Bar | Baz>' is not assignable to type 'IteratorResult<Foo>'.
 !!! error TS2322:                 Type 'Bar | Baz' is not assignable to type 'Foo'.
 !!! error TS2322:                   Property 'x' is missing in type 'Baz' but present in type 'Foo'.
+!!! related TS2728 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck25.ts:1:13: 'x' is declared here.
         yield;
         yield new Bar;
         yield new Baz;
diff --git a/tests/baselines/reference/generatorTypeCheck7.errors.txt b/tests/baselines/reference/generatorTypeCheck7.errors.txt
index e5c5abbaa86aa..78c2c1183a205 100644
--- a/tests/baselines/reference/generatorTypeCheck7.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck7.errors.txt
@@ -7,4 +7,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts(4,17): error
     }
     function* g1(): WeirdIter { }
                     ~~~~~~~~~
-!!! error TS2737: Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
\ No newline at end of file
+!!! error TS2737: Property 'hello' is missing in type 'IterableIterator<number>' but present in type 'WeirdIter'.
+!!! related TS2728 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts:2:5: 'hello' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
index f9fd2abea6676..0bad142e59f53 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
@@ -22,6 +22,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other
                                    ~
 !!! error TS2737: Property 'y' is missing in type 'Derived2' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts:7:5: 'y' is declared here.
 !!! related TS6500 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts:13:39: The expected type comes from property 'y' which is declared here on type '{ x: Derived; y: Derived; }'
     
     function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
index ae4bd4ebf625f..4ff7a89688164 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
@@ -24,6 +24,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r2 = foo(d, c); // error because C does not extend D
                     ~
 !!! error TS2737: Property 'y' is missing in type 'C' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts:9:5: 'y' is declared here.
     var r3 = foo(c, { x: '', foo: c });
     var r4 = foo(null, null);
     var r5 = foo({}, null);
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
index 3b6012e4d704d..a4a8deb9d3c9c 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
@@ -25,6 +25,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
                     ~
 !!! error TS2737: Property 'y' is missing in type 'C' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts:9:5: 'y' is declared here.
     var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
                           ~~~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
diff --git a/tests/baselines/reference/genericConstraint2.errors.txt b/tests/baselines/reference/genericConstraint2.errors.txt
index 79efd14208932..37f0580e673fc 100644
--- a/tests/baselines/reference/genericConstraint2.errors.txt
+++ b/tests/baselines/reference/genericConstraint2.errors.txt
@@ -18,6 +18,7 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'compa
           ~~~~~~~~~~~~~~~~
 !!! error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable<string>'.
 !!! error TS2420:   Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<string>'.
+!!! related TS2728 tests/cases/compiler/genericConstraint2.ts:2:5: 'comparer' is declared here.
         constructor(public currentValue: string) { }
     
         localeCompare(other) {
@@ -29,4 +30,5 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2737: Property 'compa
     var b = new ComparableString("b");
     var c = compare<ComparableString>(a, b);
                     ~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<ComparableString>'.
\ No newline at end of file
+!!! error TS2737: Property 'comparer' is missing in type 'ComparableString' but present in type 'Comparable<ComparableString>'.
+!!! related TS2728 tests/cases/compiler/genericConstraint2.ts:2:5: 'comparer' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions2.errors.txt b/tests/baselines/reference/genericTypeAssertions2.errors.txt
index c21dfd8719764..d16a476638274 100644
--- a/tests/baselines/reference/genericTypeAssertions2.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions2.errors.txt
@@ -27,7 +27,9 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2737: Property 'f
     var r3: B<number> = <A<number>>new B(); // error
         ~~
 !!! error TS2737: Property 'bar' is missing in type 'A<number>' but present in type 'B<number>'.
+!!! related TS2728 tests/cases/compiler/genericTypeAssertions2.ts:3:5: 'bar' is declared here.
     var r4: A<number> = <A<number>>new A();
     var r5: A<number> = <A<number>>[]; // error
                         ~~~~~~~~~~~~~
-!!! error TS2737: Property 'foo' is missing in type 'undefined[]' but present in type 'A<number>'.
\ No newline at end of file
+!!! error TS2737: Property 'foo' is missing in type 'undefined[]' but present in type 'A<number>'.
+!!! related TS2728 tests/cases/compiler/genericTypeAssertions2.ts:1:14: 'foo' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeConstraints.errors.txt b/tests/baselines/reference/genericTypeConstraints.errors.txt
index a760c7125f2f0..38d27c62efa35 100644
--- a/tests/baselines/reference/genericTypeConstraints.errors.txt
+++ b/tests/baselines/reference/genericTypeConstraints.errors.txt
@@ -13,6 +13,7 @@ tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2737: Property 'fo
     class BarExtended extends Bar<FooExtended> {
                                   ~~~~~~~~~~~
 !!! error TS2737: Property 'fooMethod' is missing in type 'FooExtended' but present in type 'Foo'.
+!!! related TS2728 tests/cases/compiler/genericTypeConstraints.ts:2:5: 'fooMethod' is declared here.
         constructor() {
             super();
         }
diff --git a/tests/baselines/reference/generics1.errors.txt b/tests/baselines/reference/generics1.errors.txt
index 344db160b202f..d55773fb5c187 100644
--- a/tests/baselines/reference/generics1.errors.txt
+++ b/tests/baselines/reference/generics1.errors.txt
@@ -16,6 +16,7 @@ tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' re
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
 !!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/generics1.ts:2:25: 'b' is declared here.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
     var v6: G<any>;                // Error, wrong number of arguments
diff --git a/tests/baselines/reference/generics2.errors.txt b/tests/baselines/reference/generics2.errors.txt
index be60df1b6d306..c84199c6f96f3 100644
--- a/tests/baselines/reference/generics2.errors.txt
+++ b/tests/baselines/reference/generics2.errors.txt
@@ -23,6 +23,7 @@ tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' re
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
 !!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/generics2.ts:2:25: 'b' is declared here.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
     var v6: G<any>;                // Error, wrong number of arguments
diff --git a/tests/baselines/reference/generics5.errors.txt b/tests/baselines/reference/generics5.errors.txt
index 6e48de4c66af1..f41b9e606ace5 100644
--- a/tests/baselines/reference/generics5.errors.txt
+++ b/tests/baselines/reference/generics5.errors.txt
@@ -14,5 +14,6 @@ tests/cases/compiler/generics5.ts(10,14): error TS2737: Property 'b' is missing
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
 !!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/generics5.ts:2:25: 'b' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
index 43ec772b17fff..b1f3e8b9af37a 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.errors.txt
@@ -27,6 +27,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'x' is missing in type 'Bar2' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates.ts:2:13: 'x' is declared here.
         y: number;
     }
     
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
index e3fecc218f8ab..705073ee6e495 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
@@ -89,6 +89,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
               ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'z' is missing in type 'Bar2' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts:30:9: 'z' is declared here.
             x: string;
             y: number;
         }
@@ -100,6 +101,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
               ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'z' is missing in type 'Bar3' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts:30:9: 'z' is declared here.
             private x: string;
             y: number;
         }
@@ -123,6 +125,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
               ~~~
 !!! error TS2420: Class 'Bar' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts:60:17: 'y' is declared here.
             z: number;
         }
     
@@ -142,6 +145,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
               ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar2' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts:60:17: 'y' is declared here.
             x: string;
             z: number;
         }
@@ -153,6 +157,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
               ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar3' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts:60:17: 'y' is declared here.
             private x: string;
             z: number;
         }
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
index 316463122443c..c635b9bf1494e 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt
@@ -31,6 +31,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'x' is missing in type 'Bar2' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts:2:15: 'x' is declared here.
         y: number;
     }
     
@@ -54,6 +55,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
           ~~~~
 !!! error TS2420: Class 'Bar5' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar5' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts:6:5: 'y' is declared here.
     }
     
     class Bar6 extends Foo implements I { // error
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
index a7fe83509f2a2..7899b1310fd86 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
@@ -18,9 +18,11 @@ tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Conversion of ty
         ~~
 !!! error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
 !!! error TS2322:   Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! related TS2728 tests/cases/conformance/dynamicImport/anotherModule.ts:1:14: 'D' is declared here.
     let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 !!! error TS2352:   Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' but present in type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! related TS2728 tests/cases/conformance/dynamicImport/anotherModule.ts:1:14: 'D' is declared here.
     let p3: Promise<any> = import("./defaultPath");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inheritance1.errors.txt b/tests/baselines/reference/inheritance1.errors.txt
index d7f3cd1080f83..35dc06102990f 100644
--- a/tests/baselines/reference/inheritance1.errors.txt
+++ b/tests/baselines/reference/inheritance1.errors.txt
@@ -32,6 +32,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is m
           ~~~~~~~~~
 !!! error TS2420: Class 'ImageBase' incorrectly implements interface 'SelectableControl'.
 !!! error TS2420:   Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:5:5: 'select' is declared here.
     }
     class Image1 extends Control {
     }
@@ -39,6 +40,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is m
           ~~~~~~~~~
 !!! error TS2420: Class 'Locations' incorrectly implements interface 'SelectableControl'.
 !!! error TS2420:   Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:2:13: 'state' is declared here.
         select() { }
     }
     class Locations1 {
@@ -54,6 +56,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is m
     b = c;
     ~
 !!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Button'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:9:5: 'select' is declared here.
     
     var t: TextBox;
     sc = t;
@@ -62,11 +65,13 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is m
     t = c;
     ~
 !!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'TextBox'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:12:5: 'select' is declared here.
     
     var i: ImageBase;
     sc = i;
     ~~
 !!! error TS2737: Property 'select' is missing in type 'ImageBase' but present in type 'SelectableControl'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:5:5: 'select' is declared here.
     c = i;
     i = sc;
     i = c;
@@ -75,6 +80,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is m
     sc = i1;
     ~~
 !!! error TS2737: Property 'select' is missing in type 'Image1' but present in type 'SelectableControl'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:5:5: 'select' is declared here.
     c = i1;
     i1 = sc;
     i1 = c;
@@ -83,22 +89,28 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2737: Property 'select' is m
     sc = l;
     ~~
 !!! error TS2737: Property 'state' is missing in type 'Locations' but present in type 'SelectableControl'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:2:13: 'state' is declared here.
     c = l;
     ~
 !!! error TS2737: Property 'state' is missing in type 'Locations' but present in type 'Control'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:2:13: 'state' is declared here.
     l = sc;
     l = c;
     ~
 !!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:19:5: 'select' is declared here.
     
     var l1: Locations1;
     sc = l1;
     ~~
 !!! error TS2737: Property 'state' is missing in type 'Locations1' but present in type 'SelectableControl'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:2:13: 'state' is declared here.
     c = l1;
     ~
 !!! error TS2737: Property 'state' is missing in type 'Locations1' but present in type 'Control'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:2:13: 'state' is declared here.
     l1 = sc;
     l1 = c;
     ~~
-!!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations1'.
\ No newline at end of file
+!!! error TS2737: Property 'select' is missing in type 'Control' but present in type 'Locations1'.
+!!! related TS2728 tests/cases/compiler/inheritance1.ts:22:5: 'select' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
index 32f2cc5deec64..79400e17f3fe6 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
@@ -79,6 +79,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
     elem = <h></h>; // Expect assignability error here
     ~~~~
 !!! error TS2737: Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
+!!! related TS2728 tests/cases/conformance/jsx/inline/renderer2.d.ts:7:13: '__predomBrand' is declared here.
     
     const DOMSFC = (props: {x: number, y: number, children?: dom.JSX.Element[]}) => <p>{props.x} + {props.y} = {props.x + props.y}{props.children}</p>;
     
@@ -102,6 +103,7 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property '__domBrand' is missing in type 'MyClass' but present in type 'ElementClass'.
+!!! related TS2728 tests/cases/conformance/jsx/inline/renderer.d.ts:7:13: '__domBrand' is declared here.
                                                                   ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
     
@@ -112,4 +114,5 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:   Types of property 'children' are incompatible.
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]'.
 !!! error TS2322:       Property '__domBrand' is missing in type 'Element' but present in type 'Element'.
+!!! related TS2728 tests/cases/conformance/jsx/inline/renderer.d.ts:7:13: '__domBrand' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
index 8184578ffb446..be6fbdc2db236 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.errors.txt
@@ -46,4 +46,5 @@ tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2737: Property '__pre
     elem = <h></h>; // Expect assignability error here
     ~~~~
 !!! error TS2737: Property '__predomBrand' is missing in type 'Element' but present in type 'Element'.
+!!! related TS2728 tests/cases/conformance/jsx/inline/renderer2.d.ts:7:13: '__predomBrand' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
index 2b2e686791fe9..0155ca3a71f06 100644
--- a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
@@ -44,6 +44,7 @@ tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEy
 !!! error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
 !!! error TS2345:   Types of parameters 'a' and 'a' are incompatible.
 !!! error TS2345:     Property 'coleur' is missing in type 'IEye' but present in type 'IFrenchEye'.
+!!! related TS2728 tests/cases/compiler/interfaceAssignmentCompat.ts:13:9: 'coleur' is declared here.
             // type of z inferred from specialized array type
             var z=x.sort(CompareEyes); // ok
     
diff --git a/tests/baselines/reference/interfaceDeclaration1.errors.txt b/tests/baselines/reference/interfaceDeclaration1.errors.txt
index e8fc605a26be7..df92d45030ca6 100644
--- a/tests/baselines/reference/interfaceDeclaration1.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration1.errors.txt
@@ -62,6 +62,7 @@ tests/cases/compiler/interfaceDeclaration1.ts(52,11): error TS2320: Interface 'i
           ~~
 !!! error TS2420: Class 'C1' incorrectly implements interface 'I3'.
 !!! error TS2420:   Property 'prototype' is missing in type 'C1' but present in type 'I3'.
+!!! related TS2728 tests/cases/compiler/interfaceDeclaration1.ts:12:5: 'prototype' is declared here.
         constructor() {
             var prototype: number = 3;
         }
diff --git a/tests/baselines/reference/interfaceDeclaration4.errors.txt b/tests/baselines/reference/interfaceDeclaration4.errors.txt
index c3f01806b7224..11f6a764b16c2 100644
--- a/tests/baselines/reference/interfaceDeclaration4.errors.txt
+++ b/tests/baselines/reference/interfaceDeclaration4.errors.txt
@@ -45,6 +45,7 @@ tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected
           ~~
 !!! error TS2420: Class 'C2' incorrectly implements interface 'I4'.
 !!! error TS2420:   Property 'item' is missing in type 'C2' but present in type 'I4'.
+!!! related TS2728 tests/cases/compiler/interfaceDeclaration4.ts:4:27: 'item' is declared here.
         public token: string;
     }
     
@@ -57,6 +58,7 @@ tests/cases/compiler/interfaceDeclaration4.ts(39,18): error TS1005: ';' expected
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
 !!! error TS2420:   Property 'item' is missing in type 'C3' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/interfaceDeclaration4.ts:4:27: 'item' is declared here.
     
     // Negative case 
     interface Foo.I1 { }
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
index 1cef57253dd2e..6235a117719b7 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
@@ -27,11 +27,13 @@ tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts(27,1): error TS2735: T
     i = c; // error
     ~
 !!! error TS2737: Property 'other' is missing in type 'C' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts:7:5: 'other' is declared here.
     
     i = d;
     d = i; // error
     ~
 !!! error TS2737: Property 'bar' is missing in type 'I' but present in type 'D'.
+!!! related TS2728 tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts:13:5: 'bar' is declared here.
     
     c = d;
     d = c; // error
diff --git a/tests/baselines/reference/interfaceImplementation2.errors.txt b/tests/baselines/reference/interfaceImplementation2.errors.txt
index df30d93ef5fd0..555adfb49436e 100644
--- a/tests/baselines/reference/interfaceImplementation2.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation2.errors.txt
@@ -14,6 +14,7 @@ tests/cases/compiler/interfaceImplementation2.ts(8,7): error TS2420: Class 'C3'
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
 !!! error TS2420:   Property 'iFn' is missing in type 'C3' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/interfaceImplementation2.ts:5:5: 'iFn' is declared here.
         public iObj:{ };
         public iNum:number;
         public iAny:any;
diff --git a/tests/baselines/reference/interfaceImplementation3.errors.txt b/tests/baselines/reference/interfaceImplementation3.errors.txt
index e875930aeecdf..a14c90f693b88 100644
--- a/tests/baselines/reference/interfaceImplementation3.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation3.errors.txt
@@ -14,6 +14,7 @@ tests/cases/compiler/interfaceImplementation3.ts(8,7): error TS2420: Class 'C4'
           ~~
 !!! error TS2420: Class 'C4' incorrectly implements interface 'I1'.
 !!! error TS2420:   Property 'iAny' is missing in type 'C4' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/interfaceImplementation3.ts:4:5: 'iAny' is declared here.
         public iObj:{ };
         public iNum:number;
         public iFn() { }
diff --git a/tests/baselines/reference/interfaceImplementation4.errors.txt b/tests/baselines/reference/interfaceImplementation4.errors.txt
index 727d8703f65e6..ba2db8999a0a9 100644
--- a/tests/baselines/reference/interfaceImplementation4.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation4.errors.txt
@@ -14,6 +14,7 @@ tests/cases/compiler/interfaceImplementation4.ts(8,7): error TS2420: Class 'C5'
           ~~
 !!! error TS2420: Class 'C5' incorrectly implements interface 'I1'.
 !!! error TS2420:   Property 'iObj' is missing in type 'C5' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/interfaceImplementation4.ts:2:5: 'iObj' is declared here.
         public iNum:number;
         public iAny:any;
         public iFn() { }
diff --git a/tests/baselines/reference/interfaceImplementation6.errors.txt b/tests/baselines/reference/interfaceImplementation6.errors.txt
index 24cf38ef810b1..fc1429f01353f 100644
--- a/tests/baselines/reference/interfaceImplementation6.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation6.errors.txt
@@ -24,6 +24,7 @@ tests/cases/compiler/interfaceImplementation6.ts(13,7): error TS2420: Class 'C3'
           ~~
 !!! error TS2420: Class 'C3' incorrectly implements interface 'I1'.
 !!! error TS2420:   Property 'item' is missing in type 'C3' but present in type 'I1'.
+!!! related TS2728 tests/cases/compiler/interfaceImplementation6.ts:2:5: 'item' is declared here.
         constructor() {
            var item: number;
         }
diff --git a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
index dfb62751ce534..6d55896d0bd2f 100644
--- a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
+++ b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
@@ -67,10 +67,12 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
     ~~~
 !!! error TS2322: Type 'A' is not assignable to type 'A & B'.
 !!! error TS2322:   Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:2:15: 'b' is declared here.
     anb = b;
     ~~~
 !!! error TS2322: Type 'B' is not assignable to type 'A & B'.
 !!! error TS2322:   Property 'a' is missing in type 'B' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:1:15: 'a' is declared here.
     
     x = anb;  // Ok
     x = aob;
@@ -79,6 +81,7 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'A' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'A' is not assignable to type 'C & D'.
 !!! error TS2322:       Property 'c' is missing in type 'A' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:3:15: 'c' is declared here.
     x = cnd;  // Ok
     x = cod;
     ~
@@ -86,26 +89,31 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'C' is not assignable to type '(A & B) | (C & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'C & D'.
 !!! error TS2322:       Property 'd' is missing in type 'C' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:4:15: 'd' is declared here.
     anb = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A & B'.
 !!! error TS2322:     Property 'a' is missing in type 'C & D' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:1:15: 'a' is declared here.
     aob = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A | B'.
 !!! error TS2322:     Property 'b' is missing in type 'C & D' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:2:15: 'b' is declared here.
     cnd = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C & D'.
 !!! error TS2322:     Property 'c' is missing in type 'A & B' but present in type 'C'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:3:15: 'c' is declared here.
     cod = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C | D'.
 !!! error TS2322:     Property 'd' is missing in type 'A & B' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:4:15: 'd' is declared here.
     
     y = anb;
     ~
@@ -129,16 +137,19 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322:   Type 'C' is not assignable to type '(A & C) | (A & D) | (B & C) | (B & D)'.
 !!! error TS2322:     Type 'C' is not assignable to type 'B & D'.
 !!! error TS2322:       Property 'b' is missing in type 'C' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:2:15: 'b' is declared here.
     anb = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'A & B'.
 !!! error TS2322:     Property 'b' is missing in type 'A & C' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:2:15: 'b' is declared here.
     aob = y;  // Ok
     cnd = y;
     ~~~
 !!! error TS2322: Type '(A & C) | (A & D) | (B & C) | (B & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & C' is not assignable to type 'C & D'.
 !!! error TS2322:     Property 'd' is missing in type 'A & C' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts:4:15: 'd' is declared here.
     cod = y;  // Ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionTypeAssignment.errors.txt b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
index a9344bb889bb5..2f595014bc9f0 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.errors.txt
+++ b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
@@ -17,20 +17,24 @@ tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts(14,1):
     x = a;  // Error
     ~
 !!! error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: string; }'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts:3:21: 'b' is declared here.
     y = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Property 'b' is missing in type '{ a: string; }' but present in type '{ b: string; }'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts:4:26: 'b' is declared here.
     
     b = x;
     b = y;
     x = b;  // Error
     ~
 !!! error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; b: string; }'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts:3:10: 'a' is declared here.
     y = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
+!!! related TS2728 tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts:4:10: 'a' is declared here.
     
     x = y;
     y = x;
diff --git a/tests/baselines/reference/invalidReturnStatements.errors.txt b/tests/baselines/reference/invalidReturnStatements.errors.txt
index 6627842d0314b..10c6d56eed5ca 100644
--- a/tests/baselines/reference/invalidReturnStatements.errors.txt
+++ b/tests/baselines/reference/invalidReturnStatements.errors.txt
@@ -37,5 +37,6 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(1
     function fn11(): D { return new C(); }
                          ~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'name' is missing in type 'C' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts:14:5: 'name' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/invariantGenericErrorElaboration.errors.txt b/tests/baselines/reference/invariantGenericErrorElaboration.errors.txt
index bf9c8065cea89..0bd79bcf11d6a 100644
--- a/tests/baselines/reference/invariantGenericErrorElaboration.errors.txt
+++ b/tests/baselines/reference/invariantGenericErrorElaboration.errors.txt
@@ -26,6 +26,7 @@ tests/cases/compiler/invariantGenericErrorElaboration.ts(4,19): error TS2322: Ty
 !!! error TS2322:               Type 'Constraint<Constraint<Runtype<any>>>' is not assignable to type 'Constraint<Constraint<Num>>'.
 !!! error TS2322:                 Types of property 'underlying' are incompatible.
 !!! error TS2322:                   Type 'Constraint<Runtype<any>>' is not assignable to type 'Constraint<Num>'.
+!!! related TS2728 tests/cases/compiler/invariantGenericErrorElaboration.ts:12:3: 'tag' is declared here.
     const Foo = Obj({ foo: Num })
                       ~~~
 !!! error TS2322: Type 'Num' is not assignable to type 'Runtype<any>'.
diff --git a/tests/baselines/reference/iterableArrayPattern17.errors.txt b/tests/baselines/reference/iterableArrayPattern17.errors.txt
index 8cb284d21d3ea..e8a7a0aeb635e 100644
--- a/tests/baselines/reference/iterableArrayPattern17.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern17.errors.txt
@@ -23,4 +23,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'x' is missing in type 'FooIterator' but present in type 'Bar'.
\ No newline at end of file
+!!! error TS2737: Property 'x' is missing in type 'FooIterator' but present in type 'Bar'.
+!!! related TS2728 tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts:1:13: 'x' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
index a1ed5747949f5..4e69b68dafb89 100644
--- a/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInArray9.errors.txt
@@ -28,4 +28,5 @@ tests/cases/conformance/es6/spread/iteratorSpreadInArray9.ts(13,17): error TS232
 !!! error TS2322:       Type 'SymbolIterator' is not assignable to type 'Iterator<symbol>'.
 !!! error TS2322:         Types of property 'next' are incompatible.
 !!! error TS2322:           Type '() => { value: symbol; }' is not assignable to type '(value?: any) => IteratorResult<symbol>'.
-!!! error TS2322:             Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
\ No newline at end of file
+!!! error TS2322:             Property 'done' is missing in type '{ value: symbol; }' but present in type 'IteratorResult<symbol>'.
+!!! related TS2728 /.ts/lib.es2015.iterable.d.ts:32:5: 'done' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocFunctionType.errors.txt b/tests/baselines/reference/jsdocFunctionType.errors.txt
index cd3def357be53..7b4a81c8addc5 100644
--- a/tests/baselines/reference/jsdocFunctionType.errors.txt
+++ b/tests/baselines/reference/jsdocFunctionType.errors.txt
@@ -71,4 +71,5 @@ tests/cases/conformance/jsdoc/functions.js(65,14): error TS2345: Argument of typ
                  ~
 !!! error TS2345: Argument of type 'typeof E' is not assignable to parameter of type 'new (arg1: number) => { length: number; }'.
 !!! error TS2345:   Property 'length' is missing in type 'E' but present in type '{ length: number; }'.
+!!! related TS2728 tests/cases/conformance/jsdoc/functions.js:12:28: 'length' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateTag3.errors.txt b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
index 703a7f106106e..e66c8123b18b9 100644
--- a/tests/baselines/reference/jsdocTemplateTag3.errors.txt
+++ b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
@@ -33,6 +33,7 @@ tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type
     f({ a: 12  }, undefined, undefined, 101, 'nope');
       ~~~~~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
+!!! related TS2728 tests/cases/conformance/jsdoc/a.js:2:28: 'b' is declared here.
     
     /**
      * @template {NoLongerAllowed}
diff --git a/tests/baselines/reference/jsdocTypeTagCast.errors.txt b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
index bbd0b350b1d07..365215190d8ef 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.errors.txt
+++ b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
@@ -67,6 +67,7 @@ tests/cases/conformance/jsdoc/b.js(67,8): error TS2454: Variable 'numOrStr' is u
     someBase = /** @type {SomeBase} */(someOther); // Error
                    ~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'p' is missing in type 'SomeOther' but present in type 'SomeBase'.
+!!! related TS2728 tests/cases/conformance/jsdoc/b.js:17:9: 'p' is declared here.
     
     someDerived = /** @type {SomeDerived} */(someDerived);
     someDerived = /** @type {SomeDerived} */(someBase);
@@ -77,9 +78,11 @@ tests/cases/conformance/jsdoc/b.js(67,8): error TS2454: Variable 'numOrStr' is u
     someOther = /** @type {SomeOther} */(someDerived); // Error
                     ~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'q' is missing in type 'SomeDerived' but present in type 'SomeOther'.
+!!! related TS2728 tests/cases/conformance/jsdoc/b.js:28:9: 'q' is declared here.
     someOther = /** @type {SomeOther} */(someBase); // Error
                     ~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'q' is missing in type 'SomeBase' but present in type 'SomeOther'.
+!!! related TS2728 tests/cases/conformance/jsdoc/b.js:28:9: 'q' is declared here.
     someOther = /** @type {SomeOther} */(someOther);
     
     someFakeClass = someBase;
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 8423cda5430af..13647fa2b9cbd 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -156,6 +156,7 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(152,17): error TS2339:
         let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
                                                 ~~~~~~~~
 !!! error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type 'Readonly<{ x: number; y: number; }>'.
+!!! related TS2728 tests/cases/conformance/types/mapped/mappedTypeErrors.ts:75:37: 'y' is declared here.
         let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
         let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
                                                               ~~~~
diff --git a/tests/baselines/reference/mappedTypes6.errors.txt b/tests/baselines/reference/mappedTypes6.errors.txt
index 37388585a291a..6d13c6413f49e 100644
--- a/tests/baselines/reference/mappedTypes6.errors.txt
+++ b/tests/baselines/reference/mappedTypes6.errors.txt
@@ -140,6 +140,7 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     x1 = { a: 1 };  // Error
     ~~
 !!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type 'Foo'.
+!!! related TS2728 tests/cases/conformance/types/mapped/mappedTypes6.ts:80:5: 'b' is declared here.
     x1 = { a: 1, b: 1 };
     x1 = { a: 1, b: 1, c: 1 };
     x1 = { a: 1, b: 1, c: 1, d: 1 };
@@ -160,6 +161,7 @@ tests/cases/conformance/types/mapped/mappedTypes6.ts(120,4): error TS2540: Canno
     x2 = { a: 1, b: 1, c: 1 };  // Error
     ~~
 !!! error TS2737: Property 'd' is missing in type '{ a: number; b: number; c: number; }' but present in type 'Required<Foo>'.
+!!! related TS2728 tests/cases/conformance/types/mapped/mappedTypes6.ts:82:5: 'd' is declared here.
     x2 = { a: 1, b: 1, c: 1, d: 1 };
     
     type Bar = {
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
index 007ccdc3c0893..4047fcc0b5c57 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
@@ -41,6 +41,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
           ~
 !!! error TS2420: Class 'E' incorrectly implements interface 'A'.
 !!! error TS2420:   Property 'x' is missing in type 'E' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts:2:13: 'x' is declared here.
         w: number;
         y: string;
         z: string;
diff --git a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
index 69d2d1b43a1ff..6f287f4a99893 100644
--- a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
+++ b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
@@ -17,6 +17,7 @@ tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeF
             acceptA(x);
                     ~
 !!! error TS2737: Property 'a' is missing in type 'B<T>' but present in type 'A<{}>'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts:2:17: 'a' is declared here.
         }
     
         if (x instanceof A) {
diff --git a/tests/baselines/reference/nonIterableRestElement3.errors.txt b/tests/baselines/reference/nonIterableRestElement3.errors.txt
index d1ec23b4a24a4..b8bff4d087793 100644
--- a/tests/baselines/reference/nonIterableRestElement3.errors.txt
+++ b/tests/baselines/reference/nonIterableRestElement3.errors.txt
@@ -5,4 +5,5 @@ tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts(2,5): error
     var c = { bogus: 0 };
     [...c] = ["", 0];
         ~
-!!! error TS2737: Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
\ No newline at end of file
+!!! error TS2737: Property 'bogus' is missing in type '(string | number)[]' but present in type '{ bogus: number; }'.
+!!! related TS2728 tests/cases/conformance/es6/destructuring/nonIterableRestElement3.ts:1:11: 'bogus' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
index c4a9e5f73e434..77c1e5091cca5 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
@@ -15,6 +15,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): err
     y = a; // expect error
     ~
 !!! error TS2737: Property 'foo' is missing in type '{}' but present in type '{ foo: string; }'.
+!!! related TS2728 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts:2:10: 'foo' is declared here.
     a = x;
     a = y;
     
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
index bf573e10c8288..d87703eca545b 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
@@ -27,9 +27,11 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error T
     f2({ toString: (s) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'value' is missing in type '{ toString: (s: string) => string; }' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts:2:5: 'value' is declared here.
     f2({ toString: (s: string) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'value' is missing in type '{ toString: (s: string) => string; }' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts:2:5: 'value' is declared here.
     f2({ value: '', toString: (s) => s.uhhh }) // error
                                        ~~~~
 !!! error TS2339: Property 'uhhh' does not exist on type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
index ccdb9db7898b0..0e82103cf3f2b 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
@@ -23,6 +23,7 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(13,17): error
     f2({ value: '' })
        ~~~~~~~~~~~~~
 !!! error TS2737: Property 'doStuff' is missing in type '{ value: string; }' but present in type 'I2'.
+!!! related TS2728 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts:3:5: 'doStuff' is declared here.
     f2({ value: '', what: 1 }) 
                     ~~~~~~~
 !!! error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I2'.
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
index 3a6ce5f2e7161..80c5c9f9eabb2 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
@@ -18,6 +18,7 @@ tests/cases/compiler/objectLiteralIndexerErrors.ts(14,14): error TS2322: Type 'A
     var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
                                                          ~
 !!! error TS2737: Property 'y' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/objectLiteralIndexerErrors.ts:6:5: 'y' is declared here.
 !!! related TS6501 tests/cases/compiler/objectLiteralIndexerErrors.ts:13:26: The expected type comes from this index signature.
     o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
                  ~
diff --git a/tests/baselines/reference/objectLiteralNormalization.errors.txt b/tests/baselines/reference/objectLiteralNormalization.errors.txt
index 200a715661460..6e92e2ce9dbd4 100644
--- a/tests/baselines/reference/objectLiteralNormalization.errors.txt
+++ b/tests/baselines/reference/objectLiteralNormalization.errors.txt
@@ -47,6 +47,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
     ~~
 !!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
 !!! error TS2322:   Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: number; }'.
+!!! related TS2728 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts:11:19: 'b' is declared here.
     
     // Object literals containing spreads are not normalized
     declare let b1: { a: string, b: string } | { b: string, c: string };
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
index 43ebb6dc5a63b..08058f3135ddc 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
@@ -11,4 +11,5 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
     foo(person);  // error
         ~~~~~~
 !!! error TS2737: Property 'a' is missing in type '{ name: string; id: number; }' but present in type '{ a: string; id: number; }'.
+!!! related TS2728 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts:6:19: 'a' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 44026352cf945..1d7643de8e5f5 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -47,10 +47,12 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,11): error TS233
     spread = { s: "foo" };  // error, missing 'b'
     ~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ s: string; }' but present in type '{ s: string; b: boolean; }'.
+!!! related TS2728 tests/cases/conformance/types/spread/objectSpreadNegative.ts:22:21: 'b' is declared here.
     let b = { b: false };
     spread = b; // error, missing 's'
     ~~~~~~
 !!! error TS2737: Property 's' is missing in type '{ b: boolean; }' but present in type '{ s: string; b: boolean; }'.
+!!! related TS2728 tests/cases/conformance/types/spread/objectSpreadNegative.ts:22:36: 's' is declared here.
     
     // literal repeats are not allowed, but spread repeats are fine
     let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
index 0b582a9caf147..08477d027d302 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
@@ -28,4 +28,5 @@ tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectType
     var c3: C3<T2>;
     <C4>c3; // Should fail (private x originates in the same declaration, but different types)
     ~~~~~~
-!!! error TS2737: Property 'y' is missing in type 'C3<T2>' but present in type 'C4'.
\ No newline at end of file
+!!! error TS2737: Property 'y' is missing in type 'C3<T2>' but present in type 'C4'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts:21:5: 'y' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalPropertiesInClasses.errors.txt b/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
index 29248ec558435..6f29676bebea2 100644
--- a/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesInClasses.errors.txt
@@ -16,6 +16,7 @@ tests/cases/compiler/optionalPropertiesInClasses.ts(10,7): error TS2420: Class '
           ~~
 !!! error TS2420: Class 'C2' incorrectly implements interface 'ifoo'.
 !!! error TS2420:   Property 'y' is missing in type 'C2' but present in type 'ifoo'.
+!!! related TS2728 tests/cases/compiler/optionalPropertiesInClasses.ts:3:2: 'y' is declared here.
     	public x:number;
     }
     
diff --git a/tests/baselines/reference/optionalPropertiesTest.errors.txt b/tests/baselines/reference/optionalPropertiesTest.errors.txt
index 0e6a2e3de6fa3..997548fe4386d 100644
--- a/tests/baselines/reference/optionalPropertiesTest.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesTest.errors.txt
@@ -22,6 +22,7 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     foo = { name: "test" };            // Error, id missing
     ~~~
 !!! error TS2737: Property 'id' is missing in type '{ name: string; }' but present in type 'IFoo'.
+!!! related TS2728 tests/cases/compiler/optionalPropertiesTest.ts:5:5: 'id' is declared here.
     foo = {id: 1234, print:()=>{}}	   // Ok
     
     var s = foo.name || "default";
@@ -35,9 +36,11 @@ tests/cases/compiler/optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is
     var test1: i1 = {};
         ~~~~~
 !!! error TS2737: Property 'M' is missing in type '{}' but present in type 'i1'.
+!!! related TS2728 tests/cases/compiler/optionalPropertiesTest.ts:20:16: 'M' is declared here.
     var test2: i3 = {};
         ~~~~~
 !!! error TS2737: Property 'M' is missing in type '{}' but present in type 'i3'.
+!!! related TS2728 tests/cases/compiler/optionalPropertiesTest.ts:22:16: 'M' is declared here.
     var test3: i2 = {};
     var test4: i4 = {};
     var test5: i1 = { M: function () { } };
diff --git a/tests/baselines/reference/overloadingOnConstants1.errors.txt b/tests/baselines/reference/overloadingOnConstants1.errors.txt
index e1481a478b79e..f0b643f685e91 100644
--- a/tests/baselines/reference/overloadingOnConstants1.errors.txt
+++ b/tests/baselines/reference/overloadingOnConstants1.errors.txt
@@ -29,12 +29,16 @@ tests/cases/compiler/overloadingOnConstants1.ts(25,5): error TS2737: Property 'b
     var htmlElement2: Derived1 = d2.createElement("yo")
         ~~~~~~~~~~~~
 !!! error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived1'.
+!!! related TS2728 tests/cases/compiler/overloadingOnConstants1.ts:2:31: 'bar' is declared here.
     var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
         ~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'biz' is missing in type 'Derived1' but present in type 'Derived3'.
+!!! related TS2728 tests/cases/compiler/overloadingOnConstants1.ts:4:31: 'biz' is declared here.
     var htmlDivElement2: Derived1 = d2.createElement("div");
         ~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'bar' is missing in type 'Derived2' but present in type 'Derived1'.
+!!! related TS2728 tests/cases/compiler/overloadingOnConstants1.ts:2:31: 'bar' is declared here.
     var htmlSpanElement2: Derived1 = d2.createElement("span");
         ~~~~~~~~~~~~~~~~
-!!! error TS2737: Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
\ No newline at end of file
+!!! error TS2737: Property 'bar' is missing in type 'Derived3' but present in type 'Derived1'.
+!!! related TS2728 tests/cases/compiler/overloadingOnConstants1.ts:2:31: 'bar' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
index 38bef31cc5dc0..4baed99541848 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
@@ -27,6 +27,7 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
                                         ~
 !!! error TS2737: Property 'x' is missing in type 'D' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts:1:15: 'x' is declared here.
     
     var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fails, so first overload is picked.
         ~~~~~~~
@@ -39,6 +40,7 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
 !!! error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2345:     Property 'q' is missing in type 'B' but present in type 'D'.
+!!! related TS2728 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts:4:15: 'q' is declared here.
         var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
                  ~~~~~~~~
 !!! error TS2344: Type 'D' does not satisfy the constraint 'A'.
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
index ebb9d89220b11..40618215c3a4f 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -20,6 +20,7 @@ tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cann
     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 TS2737: Property 'b' is missing in type '{ a: any; }' but present in type '{ a: number; b: number; }'.
+!!! related TS2728 tests/cases/compiler/overloadsWithProvisionalErrors.ts:3:42: 'b' is declared here.
 !!! 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/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index c68851bbfa681..f9d5985550270 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -295,6 +295,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
 !!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
+!!! related TS2728 /.ts/lib.es5.d.ts:1403:5: 'catch' is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index 0d7225347759b..67cfb6af2cdc9 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -294,6 +294,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
 !!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
+!!! related TS2728 /.ts/lib.es5.d.ts:1403:5: 'catch' is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index 5b4db38c53a68..6d8c4a89a477c 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -303,6 +303,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                                        ~~~~~~~~~
 !!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
 !!! error TS2345:   Property 'catch' is missing in type 'IPromise<string>' but present in type 'Promise<number>'.
+!!! related TS2728 /.ts/lib.es5.d.ts:1403:5: 'catch' is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
     var r11: IPromise<number>;
@@ -339,4 +340,5 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                         ~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<{}>'.
 !!! error TS2345:   Property 'catch' is missing in type 'IPromise<any>' but present in type 'Promise<{}>'.
+!!! related TS2728 /.ts/lib.es5.d.ts:1403:5: 'catch' is declared here.
     var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
\ No newline at end of file
diff --git a/tests/baselines/reference/promisesWithConstraints.errors.txt b/tests/baselines/reference/promisesWithConstraints.errors.txt
index 3c68f0f700677..dbe3f5601b8a1 100644
--- a/tests/baselines/reference/promisesWithConstraints.errors.txt
+++ b/tests/baselines/reference/promisesWithConstraints.errors.txt
@@ -23,6 +23,7 @@ tests/cases/compiler/promisesWithConstraints.ts(20,1): error TS2322: Type 'CProm
     ~
 !!! error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
 !!! error TS2322:   Property 'y' is missing in type 'Foo' but present in type 'Bar'.
+!!! related TS2728 tests/cases/compiler/promisesWithConstraints.ts:10:20: 'y' is declared here.
     
     var a2: CPromise<Foo>;
     var b2: CPromise<Bar>;
diff --git a/tests/baselines/reference/qualify.errors.txt b/tests/baselines/reference/qualify.errors.txt
index a95fea6e62205..aedbad9105d33 100644
--- a/tests/baselines/reference/qualify.errors.txt
+++ b/tests/baselines/reference/qualify.errors.txt
@@ -62,6 +62,7 @@ tests/cases/compiler/qualify.ts(58,5): error TS2737: Property 'p' is missing in
             var v2:K1.I3=v1;
                 ~~
 !!! error TS2737: Property 'zeep' is missing in type 'I4' but present in type 'I3'.
+!!! related TS2728 tests/cases/compiler/qualify.ts:37:13: 'zeep' is declared here.
             var v3:K1.I3[]=v1;
                 ~~
 !!! error TS2736: Type 'I4' is missing the following properties from type 'I3[]': length, pop, push, concat, and 16 more.
@@ -76,6 +77,7 @@ tests/cases/compiler/qualify.ts(58,5): error TS2737: Property 'p' is missing in
             var v6:{k:K1.I3;}=v1;
                 ~~
 !!! error TS2737: Property 'k' is missing in type 'I4' but present in type '{ k: I3; }'.
+!!! related TS2728 tests/cases/compiler/qualify.ts:49:17: 'k' is declared here.
         }
     }
     
@@ -87,5 +89,6 @@ tests/cases/compiler/qualify.ts(58,5): error TS2737: Property 'p' is missing in
     var x:T.I=y;
         ~
 !!! error TS2737: Property 'p' is missing in type 'I' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/qualify.ts:18:9: 'p' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
index 42b23e21c602c..c42260e55013a 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
@@ -108,6 +108,7 @@ tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2737: Proper
     			return new State(self);
     			                 ~~~~
 !!! error TS2737: Property 'getInitialState' is missing in type 'Window' but present in type 'IMode'.
+!!! related TS2728 tests/cases/compiler/recursiveClassReferenceTest.ts:66:19: 'getInitialState' is declared here.
     		}
     
     
diff --git a/tests/baselines/reference/recursiveInheritance3.errors.txt b/tests/baselines/reference/recursiveInheritance3.errors.txt
index 8ae77ecb235a1..b272f5add4f5a 100644
--- a/tests/baselines/reference/recursiveInheritance3.errors.txt
+++ b/tests/baselines/reference/recursiveInheritance3.errors.txt
@@ -7,6 +7,7 @@ tests/cases/compiler/recursiveInheritance3.ts(1,7): error TS2420: Class 'C' inco
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'other' is missing in type 'C' but present in type 'I'.
+!!! related TS2728 tests/cases/compiler/recursiveInheritance3.ts:7:5: 'other' is declared here.
         public foo(x: any) { return x; }
         private x = 1;
     }
diff --git a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
index 633f09af26d63..b70a04f833426 100644
--- a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
@@ -25,4 +25,5 @@ tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1):
     ~~~~~~~~~~~
 !!! error TS2322: Type 'LinkedList<Entity>' is not assignable to type 'LinkedList<Product>'.
 !!! error TS2322:   Property 'price' is missing in type 'LinkedList<Entity>' but present in type 'Product'.
+!!! related TS2728 tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts:8:5: 'price' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
index 0ac7d00253aeb..47b6eb4672cec 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
@@ -14,6 +14,7 @@
     const json1 = require("./json.json"); // No error (bad)
           ~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ "a": number; }' but present in type '{ b: number; }'.
+!!! related TS2728 /user.js:4:14: 'b' is declared here.
     json1.b; // No error (OK since that's the type annotation)
     
     const js0 = require("./js.js");
@@ -25,6 +26,7 @@
     const js1 = require("./js.js"); // Error (good)
           ~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ b: number; }'.
+!!! related TS2728 /user.js:11:14: 'b' is declared here.
     js1.b;
 ==== /json.json (0 errors) ====
     { "a": 0 }
diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
index a308bf6b31c19..9841ed1f16d3b 100644
--- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
+++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.errors.txt
@@ -19,18 +19,22 @@ tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.
     a = new C(); // error prop is missing
     ~
 !!! error TS2737: Property 'prop' is missing in type 'C' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:2:5: 'prop' is declared here.
     a = B; // error prop is missing
         ~
 !!! error TS2737: Property 'prop' is missing in type 'typeof B' but present in type 'A'.
+!!! related TS2728 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:2:5: 'prop' is declared here.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:13:5: Did you mean to use 'new' with this expression?
     a = C;
     
     var b: B = new C(); // error prop is missing
         ~
 !!! error TS2737: Property 'prop' is missing in type 'C' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:5:12: 'prop' is declared here.
     b = B; // error prop is missing
         ~
 !!! error TS2737: Property 'prop' is missing in type 'typeof B' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:5:12: 'prop' is declared here.
 !!! related TS6213 tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts:17:5: Did you mean to use 'new' with this expression?
     b = C;
     b = a;
diff --git a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
index ce7608188e76c..03c55f5ffdd08 100644
--- a/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
+++ b/tests/baselines/reference/strictFunctionTypesErrors.errors.txt
@@ -320,6 +320,7 @@ tests/cases/compiler/strictFunctionTypesErrors.ts(155,5): error TS2322: Type '(c
     ~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'Comparer2<Dog>' is not assignable to type 'Comparer2<Animal>'.
 !!! error TS2322:   Property 'dog' is missing in type 'Animal' but present in type 'Dog'.
+!!! related TS2728 tests/cases/compiler/strictFunctionTypesErrors.ts:91:32: 'dog' is declared here.
     dogComparer2 = animalComparer2;  // Ok
     
     // Crate<T> is invariant in --strictFunctionTypes mode
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
index a9651c29379f4..28a16632f9073 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
@@ -60,9 +60,11 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
         a: A,
            ~
 !!! error TS2737: Property 'foo' is missing in type 'typeof A' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:4:5: 'foo' is declared here.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:37:8: Did you mean to use 'new' with this expression?
         b: B
            ~
 !!! error TS2737: Property 'foo' is missing in type 'typeof B' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:4:5: 'foo' is declared here.
 !!! related TS6213 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts:38:8: Did you mean to use 'new' with this expression?
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
index 624505ee79b4b..bdacfc49548a5 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt
@@ -29,6 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Index signatures are incompatible.
 !!! error TS2430:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts:4:34: 'bar' is declared here.
         [x: number]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
index 3c629bb4e7904..80d6219de1248 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt
@@ -29,6 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415: Class 'B' incorrectly extends base class 'A'.
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts:4:34: 'bar' is declared here.
         [x: number]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
index c67b353feb7c2..2473e2c8c8f5a 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
@@ -41,6 +41,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
 !!! error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts:4:34: 'bar' is declared here.
             [x: number]: string; // error
         }
     
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
index 73795702ba886..9a24003434547 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt
@@ -30,6 +30,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2420:   Index signatures are incompatible.
 !!! error TS2420:     Type 'Base' is not assignable to type 'Derived'.
 !!! error TS2420:       Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts:4:34: 'bar' is declared here.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
index eb60996f43651..500b042f04838 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt
@@ -40,6 +40,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Types of property 'bar' are incompatible.
 !!! error TS2430:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts:6:5: 'bar' is declared here.
             foo: Derived; // ok
             bar: Base; // error
         }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
index 4f59d1cb959c9..1fef5ecd90279 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
@@ -29,6 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~
 !!! error TS2420: Class 'B' incorrectly implements interface 'A'.
 !!! error TS2420:   Property 'foo' is missing in type 'B' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts:13:9: 'foo' is declared here.
             fooo: Derived; // error
         }
     
@@ -40,6 +41,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~~
 !!! error TS2420: Class 'B2' incorrectly implements interface 'A2'.
 !!! error TS2420:   Property '1' is missing in type 'B2' but present in type 'A2'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts:21:9: '1' is declared here.
             2: Derived; // error
         }
     
@@ -51,6 +53,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~~
 !!! error TS2420: Class 'B3' incorrectly implements interface 'A3'.
 !!! error TS2420:   Property ''1'' is missing in type 'B3' but present in type 'A3'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts:29:9: ''1'' is declared here.
             '1.0': Derived; // error
         }
     }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
index 970a56ba9c2da..f27a281986082 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt
@@ -29,6 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430: Interface 'B' incorrectly extends interface 'A'.
 !!! error TS2430:   Index signatures are incompatible.
 !!! error TS2430:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts:4:34: 'bar' is declared here.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
index 76d2542e42873..0ab4a1d05e50c 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt
@@ -29,6 +29,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415: Class 'B' incorrectly extends base class 'A'.
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts:4:34: 'bar' is declared here.
         [x: string]: Base; // error
     }
     
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
index 895f605bd68e5..c3a5d9ba0395c 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
@@ -41,6 +41,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
 !!! error TS2737: Property 'bar' is missing in type 'Base' but present in type 'Derived'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts:4:34: 'bar' is declared here.
             [x: string]: string; // error
         }
     
diff --git a/tests/baselines/reference/symbolProperty10.errors.txt b/tests/baselines/reference/symbolProperty10.errors.txt
index 292c091263104..5bdeeba1ed3e6 100644
--- a/tests/baselines/reference/symbolProperty10.errors.txt
+++ b/tests/baselines/reference/symbolProperty10.errors.txt
@@ -17,4 +17,5 @@ tests/cases/conformance/es6/Symbols/symbolProperty10.ts(10,5): error TS2322: Typ
         ~
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
-!!! error TS2322:     Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
+!!! error TS2322:     Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
+!!! related TS2728 tests/cases/conformance/es6/Symbols/symbolProperty10.ts:2:29: 'y' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolProperty25.errors.txt b/tests/baselines/reference/symbolProperty25.errors.txt
index 05047ccfc3329..6d7d39fe0b43e 100644
--- a/tests/baselines/reference/symbolProperty25.errors.txt
+++ b/tests/baselines/reference/symbolProperty25.errors.txt
@@ -11,6 +11,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty25.ts(5,7): error TS2420: Clas
           ~
 !!! error TS2420: Class 'C' incorrectly implements interface 'I'.
 !!! error TS2420:   Property '[Symbol.toPrimitive]' is missing in type 'C' but present in type 'I'.
+!!! related TS2728 tests/cases/conformance/es6/Symbols/symbolProperty25.ts:2:5: '[Symbol.toPrimitive]' is declared here.
         [Symbol.toStringTag]() {
             return "";
         }
diff --git a/tests/baselines/reference/symbolProperty52.errors.txt b/tests/baselines/reference/symbolProperty52.errors.txt
index 8e730d2ecfbe2..87635a998d063 100644
--- a/tests/baselines/reference/symbolProperty52.errors.txt
+++ b/tests/baselines/reference/symbolProperty52.errors.txt
@@ -13,6 +13,7 @@ tests/cases/conformance/es6/Symbols/symbolProperty52.ts(7,12): error TS2339: Pro
     obj = {};
     ~~~
 !!! error TS2737: Property '[Symbol.nonsense]' is missing in type '{}' but present in type '{ [Symbol.nonsense]: number; }'.
+!!! related TS2728 tests/cases/conformance/es6/Symbols/symbolProperty52.ts:2:5: '[Symbol.nonsense]' is declared here.
     
     obj[Symbol.nonsense];
                ~~~~~~~~
diff --git a/tests/baselines/reference/symbolProperty9.errors.txt b/tests/baselines/reference/symbolProperty9.errors.txt
index c172740e48208..83ad18a5f8f12 100644
--- a/tests/baselines/reference/symbolProperty9.errors.txt
+++ b/tests/baselines/reference/symbolProperty9.errors.txt
@@ -17,4 +17,5 @@ tests/cases/conformance/es6/Symbols/symbolProperty9.ts(10,5): error TS2322: Type
         ~
 !!! error TS2322: Type 'I' is not assignable to type 'C'.
 !!! error TS2322:   Types of property '[Symbol.iterator]' are incompatible.
-!!! error TS2322:     Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
\ No newline at end of file
+!!! error TS2322:     Property 'y' is missing in type '{ x: any; }' but present in type '{ x: any; y: any; }'.
+!!! related TS2728 tests/cases/conformance/es6/Symbols/symbolProperty9.ts:2:29: 'y' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
index aec641c28568f..d1cd9581a4a28 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
@@ -20,6 +20,7 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     var a = foo([]);             // number
                 ~~
 !!! error TS2737: Property 'raw' is missing in type 'undefined[]' but present in type 'TemplateStringsArray'.
+!!! related TS2728 /.ts/lib.es5.d.ts:595:14: 'raw' is declared here.
     var b = foo([], 1);          // string
                 ~~
 !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
index 1218ceebb2492..ee5058df87a9d 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
@@ -20,6 +20,7 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     var a = foo([]);             // number
                 ~~
 !!! error TS2737: Property 'raw' is missing in type 'undefined[]' but present in type 'TemplateStringsArray'.
+!!! related TS2728 /.ts/lib.es5.d.ts:595:14: 'raw' is declared here.
     var b = foo([], 1);          // string
                 ~~
 !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
index 46697caaadb3d..8fb4a0de659b9 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -198,6 +198,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
     wrongPropertyName.f(13);
     ~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but present in type '{ y: number; }'.
+!!! related TS2728 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts:63:56: 'y' is declared here.
     
     let c = new C();
     c.explicitC(); // not enough arguments
@@ -277,6 +278,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Property 'x' is missing in type '{ n: number; }' but present in type '{ x: number; }'.
+!!! related TS2728 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts:104:33: 'x' is declared here.
     
     c.explicitC = d.explicitD;
     ~~~~~~~~~~~
@@ -350,6 +352,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Property 'y' is missing in type 'Base1' but present in type 'Base2'.
+!!! related TS2728 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts:131:5: 'y' is declared here.
     b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
     ~~~~~~~~~~~
 !!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
diff --git a/tests/baselines/reference/tsxAttributeResolution1.errors.txt b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
index 15aa8707d9219..fc5a355cf9294 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution1.errors.txt
@@ -57,6 +57,7 @@ tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not a
     <test2 />; // Error, missing reqd
      ~~~~~
 !!! error TS2737: Property 'reqd' is missing in type '{}' but present in type '{ reqd: string; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:5:12: 'reqd' is declared here.
     <test2 reqd={10} />; // Error, reqd is not string
            ~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxAttributeResolution12.errors.txt b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
index 3808cda0906a1..f7ece336cdc0e 100644
--- a/tests/baselines/reference/tsxAttributeResolution12.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
@@ -46,11 +46,13 @@ tests/cases/conformance/jsx/file.tsx(28,11): error TS2322: Type '{}' is not assi
               ~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
 !!! error TS2322:   Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:18:46: 'reqd' is declared here.
     
     // Should error
     var t2 = <TestMod.Test />;
               ~~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'.
 !!! error TS2322:   Property 'reqd' is missing in type '{}' but present in type '{ reqd: any; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:18:46: 'reqd' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution3.errors.txt b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
index 8a5eb7d704962..cda5a72d716e7 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution3.errors.txt
@@ -35,6 +35,7 @@ tests/cases/conformance/jsx/file.tsx(31,8): error TS2322: Type 'number' is not a
     <test1 {...obj3} />
      ~~~~~
 !!! error TS2737: Property 'x' is missing in type '{ y: number; }' but present in type 'Attribs1'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:8:2: 'x' is declared here.
     
     // OK
     var obj4 = { x: 32, y: 32 };
diff --git a/tests/baselines/reference/tsxAttributeResolution5.errors.txt b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
index adc04e87bf595..f6273c364848c 100644
--- a/tests/baselines/reference/tsxAttributeResolution5.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution5.errors.txt
@@ -41,11 +41,13 @@ tests/cases/conformance/jsx/file.tsx(29,2): error TS2737: Property 'x' is missin
     	        ~~~~~
 !!! error TS2322: Type 'T' is not assignable to type 'Attribs1'.
 !!! error TS2322:   Property 'x' is missing in type '{ y: string; }' but present in type 'Attribs1'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:9:2: 'x' is declared here.
     }
     
     
     <test1 {...{}} />; // Error, missing x
      ~~~~~
 !!! error TS2737: Property 'x' is missing in type '{}' but present in type 'Attribs1'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:9:2: 'x' is declared here.
     <test2 {...{}} />; // Error, missing toString
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution6.errors.txt b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
index 0d1b8d1948189..6d2798713beb6 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution6.errors.txt
@@ -24,6 +24,7 @@ tests/cases/conformance/jsx/file.tsx(12,2): error TS2737: Property 'n' is missin
     <test2 />;
      ~~~~~
 !!! error TS2737: Property 'n' is missing in type '{}' but present in type '{ n: boolean; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:5:12: 'n' is declared here.
     
     // OK
     <test1 n />;
diff --git a/tests/baselines/reference/tsxInvokeComponentType.errors.txt b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
index eaee951f40748..4e29cd8ecef6c 100644
--- a/tests/baselines/reference/tsxInvokeComponentType.errors.txt
+++ b/tests/baselines/reference/tsxInvokeComponentType.errors.txt
@@ -10,6 +10,7 @@ tests/cases/compiler/tsxInvokeComponentType.tsx(6,14): error TS2737: Property 's
     const bad = <Elem />;
                  ~~~~
 !!! error TS2737: Property 'someKey' is missing in type '{}' but present in type '{ someKey: string; }'.
+!!! related TS2728 tests/cases/compiler/tsxInvokeComponentType.tsx:4:37: 'someKey' is declared here.
     
     const good = <Elem someKey="ok" />;
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
index 7548bc6bcfa7e..11b8e22e794fc 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
@@ -15,6 +15,7 @@ tests/cases/conformance/jsx/file.tsx(11,10): error TS2737: Property 'AnotherProp
             <AnotherComponent {...props} />
              ~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but present in type 'AnotherComponentProps'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:17:5: 'AnotherProperty1' is declared here.
         );
     }
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
index 430fd1d20b5df..1c9a63bbeb71e 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
@@ -19,6 +19,7 @@ tests/cases/conformance/jsx/file.tsx(13,10): error TS2322: Type '{ editable: tru
              ~~~~~~~~~~~~~
 !!! error TS2322: Type '{ editable: true; }' is not assignable to type '(IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: false; } & { children?: ReactNode; }) | (IntrinsicAttributes & IntrinsicClassAttributes<TextComponent> & { editable: true; onEdit: (newText: string) => void; } & { children?: ReactNode; })'.
 !!! error TS2322:   Property 'onEdit' is missing in type '{ editable: true; }' but present in type '{ editable: true; onEdit: (newText: string) => void; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:4:36: 'onEdit' is declared here.
     
     const textProps: TextProps = {
         editable: false
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
index bb894a33e347c..6a4626714ddd3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
@@ -33,6 +33,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
     const c1 = <OneThing yy={10}/>;  // missing property;
                 ~~~~~~~~
 !!! error TS2737: Property 'yy1' is missing in type '{ yy: number; }' but present in type '{ yy: number; yy1: string; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:3:43: 'yy1' is declared here.
     const c2 = <OneThing {...obj} yy1 />; // type incompatible;
                                   ~~~
 !!! error TS2322: Type 'true' is not assignable to type 'string'.
@@ -57,6 +58,7 @@ tests/cases/conformance/jsx/file.tsx(35,29): error TS2322: Type 'string' is not
     const d1 = <TestingOneThing extra-data />
                 ~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'yy' is missing in type '{ extra-data: true; }' but present in type '{ yy: string; direction?: number; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:22:38: 'yy' is declared here.
     const d2 = <TestingOneThing yy="hello" direction="left" />
                                            ~~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
index 9dd80af9f5e10..84e422068fa94 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
@@ -57,6 +57,7 @@ tests/cases/conformance/jsx/file.tsx(45,11): error TS2559: Type '{ prop1: boolea
     let h = <MeetAndGreet extra-prop-name="World" />;
              ~~~~~~~~~~~~
 !!! error TS2737: Property '"prop-name"' is missing in type '{ extra-prop-name: string; }' but present in type '{ "prop-name": string; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:11:27: '"prop-name"' is declared here.
     
     // Error
     let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
index de4fcc59bab6f..92dc1de88f2e0 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
@@ -15,8 +15,10 @@ tests/cases/conformance/jsx/file.tsx(10,15): error TS2322: Type 'T & { ignore-pr
         let a0 = <OverloadComponent a={arg1.b}/>
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ b: {}; a: number; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:5:49: 'b' is declared here.
         let a2 = <OverloadComponent {...arg1} ignore-prop />  // missing a
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'T & { ignore-prop: true; }' is not assignable to type 'IntrinsicAttributes & { b: {}; a: {}; }'.
 !!! error TS2322:   Property 'a' is missing in type '{ b: number; } & { ignore-prop: true; }' but present in type '{ b: {}; a: {}; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:5:55: 'a' is declared here.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxUnionElementType6.errors.txt b/tests/baselines/reference/tsxUnionElementType6.errors.txt
index 751cb75e0e954..c01665f1ac60b 100644
--- a/tests/baselines/reference/tsxUnionElementType6.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType6.errors.txt
@@ -34,8 +34,10 @@ tests/cases/conformance/jsx/file.tsx(21,10): error TS2737: Property 'x' is missi
     let c = <SFC2AndEmptyComp />;
              ~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'x' is missing in type '{}' but present in type '{ x: boolean; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:11:23: 'x' is declared here.
     let d = <SFC2AndEmptyComp data-prop />;
              ~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'x' is missing in type '{ data-prop: true; }' but present in type '{ x: boolean; }'.
+!!! related TS2728 tests/cases/conformance/jsx/file.tsx:11:23: 'x' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
index 1bbf22a9fb72b..8b8ad067fdf80 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.errors.txt
@@ -11,4 +11,5 @@ tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpre
     foo(class { static prop = "hello" }).length;
         ~~~~~
 !!! error TS2345: Argument of type 'typeof (Anonymous class)' is not assignable to parameter of type 'typeof (Anonymous class)'.
-!!! error TS2345:   Property 'prop' is missing in type '(Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
\ No newline at end of file
+!!! error TS2345:   Property 'prop' is missing in type '(Anonymous class)' but present in type 'foo<{}>.(Anonymous class)'.
+!!! related TS2728 tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression2.ts:1:29: 'prop' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
index 1454635bd4173..bdbbc5b9896f3 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
@@ -10,4 +10,5 @@ tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): er
     var e: Elephant;
     f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
          ~
-!!! error TS2737: Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
\ No newline at end of file
+!!! error TS2737: Property 'y' is missing in type 'Elephant' but present in type 'Giraffe'.
+!!! related TS2728 tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts:2:36: 'y' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index ca9a33f5e400b..26540be9b6957 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -55,6 +55,7 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     someBase = <SomeBase>someOther; // Error
                ~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'p' is missing in type 'SomeOther' but present in type 'SomeBase'.
+!!! related TS2728 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:15:13: 'p' is declared here.
     
     someDerived = <SomeDerived>someDerived;
     someDerived = <SomeDerived>someBase;
@@ -65,9 +66,11 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     someOther = <SomeOther>someDerived; // Error
                 ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'q' is missing in type 'SomeDerived' but present in type 'SomeOther'.
+!!! related TS2728 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:21:13: 'q' is declared here.
     someOther = <SomeOther>someBase; // Error
                 ~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property 'q' is missing in type 'SomeBase' but present in type 'SomeOther'.
+!!! related TS2728 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:21:13: 'q' is declared here.
     someOther = <SomeOther>someOther;
     
     // Type assertion cannot be a type-predicate type
diff --git a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
index 2c7a106ff2060..295f60426c145 100644
--- a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
+++ b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
@@ -24,6 +24,7 @@ tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithInt
             ~~~~~~~~~~
 !!! error TS2352: Conversion of type 'I2' to type 'I1 & I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 !!! error TS2352:   Property 'p3' is missing in type 'I2' but present in type 'I3'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts:10:5: 'p3' is declared here.
     var b = <I3>z;
             ~~~~~
 !!! error TS2352: Conversion of type 'I2' to type 'I3' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
index 98239b279a7b6..d36d3bb035c48 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
@@ -133,6 +133,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
                                                       ~
 !!! error TS2677: A type predicate's type must be assignable to its parameter's type.
 !!! error TS2677:   Property 'propA' is missing in type 'B' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts:2:5: 'propA' is declared here.
         return true;
     }
     
@@ -189,6 +190,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(166,54
 !!! error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'.
 !!! error TS2345:   Type predicate 'p1 is C' is not assignable to 'p1 is B'.
 !!! error TS2345:     Property 'propB' is missing in type 'C' but present in type 'B'.
+!!! related TS2728 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts:6:5: 'propB' is declared here.
     
     // Boolean not assignable to type guard
     var assign1: (p1, p2) => p1 is A;
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
index fc850c69f8cbf..9d3088c82a091 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
@@ -43,11 +43,13 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors
 !!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'.
 !!! error TS2322:   Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'.
 !!! error TS2322:     Property 'follow' is missing in type 'LeadGuard' but present in type 'FollowerGuard'.
+!!! related TS2728 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts:15:5: 'follow' is declared here.
     b.isLeader = b.isFollower;
     ~~~~~~~~~~
 !!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'.
 !!! error TS2322:   Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'.
 !!! error TS2322:     Property 'lead' is missing in type 'FollowerGuard' but present in type 'LeadGuard'.
+!!! related TS2728 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts:11:5: 'lead' is declared here.
     
     a.isFollower = a.isLeader;
     ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/typeMatch1.errors.txt b/tests/baselines/reference/typeMatch1.errors.txt
index 492880ca2dc26..ad399ccd437a5 100644
--- a/tests/baselines/reference/typeMatch1.errors.txt
+++ b/tests/baselines/reference/typeMatch1.errors.txt
@@ -29,6 +29,7 @@ tests/cases/compiler/typeMatch1.ts(20,1): error TS2367: This condition will alwa
     x6=C;
        ~
 !!! error TS2737: Property 'x' is missing in type 'typeof C' but present in type 'C'.
+!!! related TS2728 tests/cases/compiler/typeMatch1.ts:12:19: 'x' is declared here.
 !!! related TS6213 tests/cases/compiler/typeMatch1.ts:19:4: Did you mean to use 'new' with this expression?
     C==D;
     ~~~~
diff --git a/tests/baselines/reference/typeMatch2.errors.txt b/tests/baselines/reference/typeMatch2.errors.txt
index f77681d06aecf..5284797c5a8e2 100644
--- a/tests/baselines/reference/typeMatch2.errors.txt
+++ b/tests/baselines/reference/typeMatch2.errors.txt
@@ -23,6 +23,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2737: Property 'y' is missing
         a = { x: 1 }; // error
         ~
 !!! error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
+!!! related TS2728 tests/cases/compiler/typeMatch2.ts:2:18: 'y' is declared here.
     	a = { x: 1, y: 2, z: 3 };
     	                  ~~~~
 !!! error TS2322: Type '{ x: number; y: number; z: number; }' is not assignable to type '{ x: number; y: number; }'.
@@ -46,6 +47,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2737: Property 'y' is missing
         ~~
 !!! error TS2322: Type 'Animal[]' is not assignable to type 'Giraffe[]'.
 !!! error TS2322:   Property 'g' is missing in type 'Animal' but present in type 'Giraffe'.
+!!! related TS2728 tests/cases/compiler/typeMatch2.ts:10:40: 'g' is declared here.
         var xa = { f1: 5, f2: aa };
         var xb = { f1: 5, f2: gg };
         xa = xb; // Should be ok
@@ -72,6 +74,7 @@ tests/cases/compiler/typeMatch2.ts(35,5): error TS2737: Property 'y' is missing
         a = { x: 1 }; // error
         ~
 !!! error TS2737: Property 'y' is missing in type '{ x: number; }' but present in type '{ x: number; y: number; }'.
+!!! related TS2728 tests/cases/compiler/typeMatch2.ts:30:21: 'y' is declared here.
         var mf = function m(n) { return false; };
         var zf = function z(n: number) { return true; };
         mf=zf;
diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
index 96d6b1768edb4..0c96382e37a1a 100644
--- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
+++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
@@ -27,6 +27,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     var x1: A<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
 !!! error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
+!!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:12:13: 'a' is declared here.
     var x2: A<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
 !!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
@@ -35,6 +36,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     var x3: B<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
 !!! error TS2737: Property 'a' is missing in type '{ b: string; }' but present in type '{ a: string; }'.
+!!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:14:13: 'a' is declared here.
     var x4: B<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
 !!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
@@ -43,9 +45,11 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     var x5: A<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: number; }'.
+!!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:16:24: 'b' is declared here.
     var x6: B<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: string; }' but present in type '{ a: string; b: number; }'.
+!!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:17:24: 'b' is declared here.
     
     interface I1 {
         a: string;
@@ -59,6 +63,7 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     var x7: A<I2, I1>;
                   ~~
 !!! error TS2737: Property 'b' is missing in type 'I1' but present in type 'I2'.
+!!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:25:5: 'b' is declared here.
     var x8: B<I2, I1>;
                   ~~
 !!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
index 073731a2cd103..2bf00a00a4e28 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
@@ -11,4 +11,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts(7,30):
     var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
                                  ~
 !!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts:3:25: 'b' is declared here.
 !!! 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 41d2ff1b70c9a..b773e3148790d 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
@@ -11,4 +11,5 @@ tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts(7,35):
     var d = f(a, b, u2 => u2.b, t2 => t2);
                                       ~~
 !!! error TS2737: Property 'b' is missing in type 'A' but present in type 'B'.
+!!! related TS2728 tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts:3:25: 'b' is declared here.
 !!! 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/typedefMultipleTypeParameters.errors.txt b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
index 1f1c5b039100d..9971e5a6c2fbd 100644
--- a/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
+++ b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
@@ -18,6 +18,7 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missi
     /** @type {Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>} */
                           ~~~~~~~~~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
+!!! related TS2728 tests/cases/conformance/jsdoc/a.js:2:28: 'b' is declared here.
     var wrong;
     
     /** @type {Everything<{ a: number  }>} */
@@ -29,4 +30,5 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2737: Property 'b' is missi
     declare var actually: Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>;
                                      ~~~~~~~~~~~~~~
 !!! error TS2737: Property 'b' is missing in type '{ a: number; }' but present in type '{ a: number; b: string; }'.
+!!! related TS2728 tests/cases/conformance/jsdoc/a.js:2:28: 'b' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofInternalModules.errors.txt b/tests/baselines/reference/typeofInternalModules.errors.txt
index 27bcda3319324..0c4483e28e430 100644
--- a/tests/baselines/reference/typeofInternalModules.errors.txt
+++ b/tests/baselines/reference/typeofInternalModules.errors.txt
@@ -31,6 +31,7 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2737: Property 'ins
     x5 = Outer;
     ~~
 !!! error TS2737: Property 'C' is missing in type 'typeof Outer' but present in type 'typeof instantiated'.
+!!! related TS2728 tests/cases/compiler/typeofInternalModules.ts:3:22: 'C' is declared here.
     x5 = Outer.instantiated;
     var x6: typeof importUninst;
                    ~~~~~~~~~~~~
@@ -39,4 +40,5 @@ tests/cases/compiler/typeofInternalModules.ts(23,1): error TS2737: Property 'ins
     x7 = importInst;
     ~~
 !!! error TS2737: Property 'instantiated' is missing in type 'typeof instantiated' but present in type 'typeof Outer'.
+!!! related TS2728 tests/cases/compiler/typeofInternalModules.ts:2:19: 'instantiated' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
index 95ba35fce27f9..87a9e4f792242 100644
--- a/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
+++ b/tests/baselines/reference/types.asyncGenerators.esnext.2.errors.txt
@@ -170,11 +170,13 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.esnext.2.ts(
     async function * explicitReturnType10(): IterableIterator<number> {
                                              ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2737: Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'IterableIterator<number>'.
+!!! related TS2728 /.ts/lib.es2015.iterable.d.ts:47:5: '[Symbol.iterator]' is declared here.
         yield 1;
     }
     async function * explicitReturnType11(): Iterable<number> {
                                              ~~~~~~~~~~~~~~~~
 !!! error TS2737: Property '[Symbol.iterator]' is missing in type 'AsyncIterableIterator<any>' but present in type 'Iterable<number>'.
+!!! related TS2728 /.ts/lib.es2015.iterable.d.ts:43:5: '[Symbol.iterator]' is declared here.
         yield 1;
     }
     async function * explicitReturnType12(): Iterator<number> {
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
index 14b03b29375d4..a5bdcaa33fd48 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
@@ -9,6 +9,7 @@ tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2737: Property 'M
     var y: {M2: Object} = foo0;
         ~
 !!! error TS2737: Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")' but present in type '{ M2: Object; }'.
+!!! related TS2728 tests/cases/conformance/externalModules/foo_1.ts:5:9: 'M2' is declared here.
     
 ==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
     export interface Person {
diff --git a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
index c69059ccba6ba..8cb2b9ce158cc 100644
--- a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
+++ b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.errors.txt
@@ -51,16 +51,19 @@ tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts(50,1): error TS2322: Typ
 !!! error TS2322: Type 'A<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'A<Foo>' is not assignable to type 'A<Bar>'.
 !!! error TS2322:     Property 'bar' is missing in type 'Foo' but present in type 'Bar'.
+!!! related TS2728 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts:2:17: 'bar' is declared here.
     thingOfInterfaces = b;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'B<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'B<Foo>' is not assignable to type 'B<Baz>'.
 !!! error TS2322:     Property 'baz' is missing in type 'Foo' but present in type 'Baz'.
+!!! related TS2728 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts:3:17: 'baz' is declared here.
     thingOfInterfaces = c;
     ~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'C<Foo>' is not assignable to type 'A<Bar> | B<Baz> | C<Kwah>'.
 !!! error TS2322:   Type 'C<Foo>' is not assignable to type 'C<Kwah>'.
 !!! error TS2322:     Property 'kwah' is missing in type 'Foo' but present in type 'Kwah'.
+!!! related TS2728 tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts:4:18: 'kwah' is declared here.
     
     ////////
     
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
index 6581733b88bdd..12ddccb71c14e 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
@@ -33,10 +33,12 @@ tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Module | Class' is not assignable to type 'Namespace'.
 !!! error TS2322:       Property 'members' is missing in type 'Class' but present in type 'Namespace'.
+!!! related TS2728 tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts:6:12: 'members' is declared here.
     p = c;
     ~
 !!! error TS2322: Type 'Class' is not assignable to type 'Property'.
 !!! error TS2322:   Types of property 'parent' are incompatible.
 !!! error TS2322:     Type 'Namespace' is not assignable to type 'Module | Class'.
 !!! error TS2322:       Property 'parent' is missing in type 'Namespace' but present in type 'Class'.
+!!! related TS2728 tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts:10:12: 'parent' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypesAssignability.errors.txt b/tests/baselines/reference/unionTypesAssignability.errors.txt
index e23eaf7ed646d..f95c5151ff1dd 100644
--- a/tests/baselines/reference/unionTypesAssignability.errors.txt
+++ b/tests/baselines/reference/unionTypesAssignability.errors.txt
@@ -47,6 +47,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = e;
     ~
 !!! error TS2737: Property 'foo1' is missing in type 'E' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts:3:21: 'foo1' is declared here.
     d = unionDE; // error e is not assignable to d
     ~
 !!! error TS2322: Type 'D | E' is not assignable to type 'D'.
@@ -54,6 +55,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     e = d;
     ~
 !!! error TS2737: Property 'foo2' is missing in type 'D' but present in type 'E'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts:4:21: 'foo2' is declared here.
     e = e;
     e = unionDE; // error d is not assignable to e
     ~
@@ -80,9 +82,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTyp
     d = c;
     ~
 !!! error TS2737: Property 'foo1' is missing in type 'C' but present in type 'D'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts:3:21: 'foo1' is declared here.
     e = c;
     ~
 !!! error TS2737: Property 'foo2' is missing in type 'C' but present in type 'E'.
+!!! related TS2728 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/unionTypesAssignability.ts:4:21: 'foo2' is declared here.
     unionDE = c; // error since C is not assinable to either D or E
     ~~~~~~~
 !!! error TS2322: Type 'C' is not assignable to type 'D | E'.

From 32b78486a42aad0e99ac72ca57dbd6c814527260 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 2 Nov 2018 13:41:12 -0700
Subject: [PATCH 5/6] Fix crash (why can declarations be undefined)

---
 src/compiler/checker.ts                                      | 2 +-
 tests/baselines/reference/castingTuple.errors.txt            | 1 +
 tests/baselines/reference/contextualTypeWithTuple.errors.txt | 1 +
 .../reference/destructuringParameterDeclaration2.errors.txt  | 1 +
 tests/baselines/reference/genericRestParameters3.errors.txt  | 5 +++++
 .../reference/typeofAmbientExternalModules.errors.txt        | 1 +
 tests/baselines/reference/typeofExternalModules.errors.txt   | 1 +
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index deaa439b5359f..c8dde93a8d305 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -12239,7 +12239,7 @@ namespace ts {
                         if (props.length === 1) {
                             const propName = symbolToString(unmatchedProperty);
                             reportError(Diagnostics.Property_0_is_missing_in_type_1_but_present_in_type_2, propName, typeToString(source), typeToString(target));
-                            if (unmatchedProperty.declarations[0]) {
+                            if (length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(createDiagnosticForNode(unmatchedProperty.declarations[0], Diagnostics._0_is_declared_here, propName));
                             }
                         }
diff --git a/tests/baselines/reference/castingTuple.errors.txt b/tests/baselines/reference/castingTuple.errors.txt
index c7bffb9ad5a12..5099711e38c88 100644
--- a/tests/baselines/reference/castingTuple.errors.txt
+++ b/tests/baselines/reference/castingTuple.errors.txt
@@ -63,6 +63,7 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
              ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type '[C, D]' to type '[A, I]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 !!! error TS2352:   Property 'a' is missing in type 'C' but present in type 'A'.
+!!! related TS2728 tests/cases/conformance/types/tuple/castingTuple.ts:2:11: 'a' is declared here.
     var array1 = <number[]>numStrTuple;
         ~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
diff --git a/tests/baselines/reference/contextualTypeWithTuple.errors.txt b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
index 70e6aa978de25..6b6d2e0e5d716 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
@@ -43,6 +43,7 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
     objNumTuple = [ {}, 5];
                     ~~
 !!! error TS2737: Property 'a' is missing in type '{}' but present in type '{ a: string; }'.
+!!! related TS2728 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts:5:21: 'a' is declared here.
     numStrBoolTuple = numStrTuple;
     ~~~~~~~~~~~~~~~
 !!! error TS2737: Property '2' is missing in type '[number, string]' but present in type '[number, string, boolean]'.
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
index 8609a78889cc6..ddbaf8fe5c90d 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
@@ -86,6 +86,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
     c1({});            // Error, implied type is {z:number}?
        ~~
 !!! error TS2737: Property 'z' is missing in type '{}' but present in type '{ z: number; }'.
+!!! related TS2728 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts:27:21: 'z' is declared here.
     c1({ z: true });   // Error, implied type is {z:number}?
          ~
 !!! error TS2322: Type 'true' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index 505457eefeee2..ebc3552ccaef3 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -102,6 +102,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     let b = bar<CoolArray<number>>(10, 20);  // Error
                                    ~~
 !!! error TS2737: Property 'hello' is missing in type '[10, 20]' but present in type 'CoolArray<number>'.
+!!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     
     declare function baz<T>(...args: CoolArray<T>): void;
     declare const ca: CoolArray<number>;
@@ -109,15 +110,19 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     baz();       // Error
     ~~~~~
 !!! error TS2737: Property 'hello' is missing in type '[]' but present in type 'CoolArray<never>'.
+!!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     baz(1);      // Error
         ~
 !!! error TS2737: Property 'hello' is missing in type '[number]' but present in type 'CoolArray<{}>'.
+!!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     baz(1, 2);   // Error
         ~
 !!! error TS2737: Property 'hello' is missing in type '[number, number]' but present in type 'CoolArray<{}>'.
+!!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     baz(...ca);  // Error
         ~~~~~
 !!! error TS2737: Property 'hello' is missing in type 'number[]' but present in type 'CoolArray<number>'.
+!!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     
     // Repro from #26491
     
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
index 2a7d290b9a350..a4f2d8ec597ab 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
@@ -12,6 +12,7 @@ tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2737: Prope
     y1 = exp;
     ~~
 !!! error TS2737: Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
+!!! related TS2728 tests/cases/compiler/typeofAmbientExternalModules_0.ts:1:14: 'C' is declared here.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
diff --git a/tests/baselines/reference/typeofExternalModules.errors.txt b/tests/baselines/reference/typeofExternalModules.errors.txt
index cc47f915d19f5..9b9e7156409a4 100644
--- a/tests/baselines/reference/typeofExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofExternalModules.errors.txt
@@ -10,6 +10,7 @@ tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2737: Property
     y1 = exp;
     ~~
 !!! error TS2737: Property 'C' is missing in type 'typeof D' but present in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
+!!! related TS2728 /.src/tests/cases/compiler/typeofExternalModules_external.ts:1:14: 'C' is declared here.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~

From 3fe58cda757acb1bbe858c7d6ac978809fdfac75 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 8 Nov 2018 17:01:20 -0800
Subject: [PATCH 6/6] Only skip top elaboration when no variant message is
 provided

---
 src/compiler/checker.ts                       | 13 ++++----
 ...umentExpressionContextualTyping.errors.txt |  6 ++--
 .../reference/arrayAssignmentTest3.errors.txt |  6 ++--
 ...ambdaToNominalSubtypeOfFunction.errors.txt | 12 +++++---
 ...signingFromObjectToAnythingElse.errors.txt | 12 +++++---
 ...CompatFunctionsWithOptionalArgs.errors.txt |  6 ++--
 ...ember-off-of-function-interface.errors.txt |  6 ++--
 ...ember-off-of-function-interface.errors.txt |  6 ++--
 .../reference/castingTuple.errors.txt         | 12 +++++---
 .../reference/constraints0.errors.txt         |  6 ++--
 .../decoratorOnClassMethod10.errors.txt       |  6 ++--
 ...tructuringParameterDeclaration2.errors.txt |  6 ++--
 ...cturingParameterDeclaration3ES5.errors.txt |  6 ++--
 ...arameterDeclaration3ES5iterable.errors.txt |  6 ++--
 ...cturingParameterDeclaration3ES6.errors.txt |  6 ++--
 ...tructuringParameterDeclaration4.errors.txt |  6 ++--
 ...tructuringParameterDeclaration5.errors.txt |  6 ++--
 .../differentTypesWithSameName.errors.txt     |  6 ++--
 .../exportDefaultStripsFreshness.errors.txt   | 12 +++++---
 tests/baselines/reference/fuzzy.errors.txt    |  6 ++--
 ...thObjectTypeArgsAndConstraints4.errors.txt |  6 ++--
 ...thObjectTypeArgsAndConstraints5.errors.txt |  6 ++--
 .../reference/genericConstraint2.errors.txt   |  6 ++--
 .../genericRestParameters3.errors.txt         | 30 ++++++++++++-------
 .../genericTypeAssertions2.errors.txt         |  6 ++--
 .../genericTypeConstraints.errors.txt         |  6 ++--
 .../baselines/reference/generics1.errors.txt  |  6 ++--
 .../baselines/reference/generics2.errors.txt  |  6 ++--
 .../baselines/reference/generics5.errors.txt  |  6 ++--
 ...sxFactoryDeclarationsLocalTypes.errors.txt |  6 ++--
 .../reference/intTypeCheck.errors.txt         | 12 +++++---
 .../iterableArrayPattern10.errors.txt         |  6 ++--
 .../iterableArrayPattern13.errors.txt         |  6 ++--
 .../iterableArrayPattern16.errors.txt         |  6 ++--
 .../iterableArrayPattern17.errors.txt         |  6 ++--
 .../iterableArrayPattern18.errors.txt         |  6 ++--
 .../iterableArrayPattern19.errors.txt         |  6 ++--
 .../iterableArrayPattern26.errors.txt         |  6 ++--
 .../reference/jsdocTemplateTag3.errors.txt    |  6 ++--
 .../reference/jsdocTypeTagCast.errors.txt     | 24 ++++++++++-----
 .../reference/mappedTypeErrors.errors.txt     |  6 ++--
 ...wingGenericTypeFromInstanceof01.errors.txt |  6 ++--
 .../noImplicitAnyInCastExpression.errors.txt  |  6 ++--
 ...eralFunctionArgContextualTyping.errors.txt | 12 +++++---
 ...ralFunctionArgContextualTyping2.errors.txt |  6 ++--
 ...handPropertiesFunctionArgument2.errors.txt |  6 ++--
 ...bjectTypesIdentityWithPrivates3.errors.txt |  6 ++--
 ...nWithConstraintCheckingDeferred.errors.txt |  6 ++--
 .../recursiveClassReferenceTest.errors.txt    |  6 ++--
 .../reference/restTupleElements1.errors.txt   | 24 ++++++++++-----
 .../reference/strictBindCallApply1.errors.txt |  6 ++--
 .../subtypingWithNumericIndexer4.errors.txt   |  6 ++--
 .../subtypingWithStringIndexer4.errors.txt    |  6 ++--
 ...eStringsWithOverloadResolution1.errors.txt |  6 ++--
 ...ingsWithOverloadResolution1_ES6.errors.txt |  6 ++--
 ...tringsArrayTypeDefinedInES5Mode.errors.txt |  6 ++--
 ...ringsArrayTypeNotDefinedES5Mode.errors.txt |  6 ++--
 ...ingsArrayTypeRedefinedInES6Mode.errors.txt |  6 ++--
 .../thisTypeInFunctionsNegative.errors.txt    |  6 ++--
 ...renceWithConstraintAsCommonRoot.errors.txt |  6 ++--
 .../reference/typeAssertions.errors.txt       | 24 ++++++++++-----
 .../typeParamExtendsOtherTypeParam.errors.txt | 30 ++++++++++++-------
 .../typedefMultipleTypeParameters.errors.txt  | 12 +++++---
 63 files changed, 351 insertions(+), 178 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7d81f81f7a33a..e287a5d45a90a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11656,12 +11656,9 @@ namespace ts {
                 }
 
                 if (!result && reportErrors) {
-                    if (suppressNextError) {
-                        // Used by, eg, missing property checking to replace the top-level message with a more informative one
-                        suppressNextError = false;
-                        return result;
-                    }
-                    else if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Primitive) {
+                    const maybeSuppress = suppressNextError;
+                    suppressNextError = false;
+                    if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Primitive) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
                     else if (source.symbol && source.flags & TypeFlags.Object && globalObjectType === source) {
@@ -11677,6 +11674,10 @@ namespace ts {
                             return result;
                         }
                     }
+                    if (!headMessage && maybeSuppress) {
+                        // Used by, eg, missing property checking to replace the top-level message with a more informative one
+                        return result;
+                    }
                     reportRelationError(headMessage, source, target);
                 }
                 return result;
diff --git a/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt b/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt
index c2a98a2bf6f7b..c983abfa1bec8 100644
--- a/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt
+++ b/tests/baselines/reference/argumentExpressionContextualTyping.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(16,5): error TS2739: Type '(string | number | boolean)[]' is missing the following properties from type '[string, number, boolean]': 0, 1, 2
+tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(16,5): error TS2345: Argument of type '(string | number | boolean)[]' is not assignable to parameter of type '[string, number, boolean]'.
+  Type '(string | number | boolean)[]' is missing the following properties from type '[string, number, boolean]': 0, 1, 2
 tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(17,5): error TS2345: Argument of type '[string, number, true, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
   Types of property 'length' are incompatible.
     Type 'number' is not assignable to type '3'.
@@ -25,7 +26,8 @@ tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextua
     
     baz(array);                          // Error
         ~~~~~
-!!! error TS2739: Type '(string | number | boolean)[]' is missing the following properties from type '[string, number, boolean]': 0, 1, 2
+!!! error TS2345: Argument of type '(string | number | boolean)[]' is not assignable to parameter of type '[string, number, boolean]'.
+!!! error TS2345:   Type '(string | number | boolean)[]' is missing the following properties from type '[string, number, boolean]': 0, 1, 2
     baz(["string", 1, true, ...array]);  // Error
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '[string, number, true, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
diff --git a/tests/baselines/reference/arrayAssignmentTest3.errors.txt b/tests/baselines/reference/arrayAssignmentTest3.errors.txt
index 0edfcc972fd09..04b49ff6dafc0 100644
--- a/tests/baselines/reference/arrayAssignmentTest3.errors.txt
+++ b/tests/baselines/reference/arrayAssignmentTest3.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/arrayAssignmentTest3.ts(12,25): error TS2740: Type 'B' is missing the following properties from type 'B[]': length, pop, push, concat, and 16 more.
+tests/cases/compiler/arrayAssignmentTest3.ts(12,25): error TS2345: Argument of type 'B' is not assignable to parameter of type 'B[]'.
+  Type 'B' is missing the following properties from type 'B[]': length, pop, push, concat, and 16 more.
 
 
 ==== tests/cases/compiler/arrayAssignmentTest3.ts (1 errors) ====
@@ -15,6 +16,7 @@ tests/cases/compiler/arrayAssignmentTest3.ts(12,25): error TS2740: Type 'B' is m
     
     var xx = new a(null, 7, new B());
                             ~~~~~~~
-!!! error TS2740: Type 'B' is missing the following properties from type 'B[]': length, pop, push, concat, and 16 more.
+!!! error TS2345: Argument of type 'B' is not assignable to parameter of type 'B[]'.
+!!! error TS2345:   Type 'B' is missing the following properties from type 'B[]': length, pop, push, concat, and 16 more.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
index 4c97a36ea0878..eeab9734ccdbb 100644
--- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
+++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt
@@ -1,5 +1,7 @@
-tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(7,4): error TS2741: Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
-tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS2741: Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
+tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(7,4): error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
+  Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
+tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
+  Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
 
 
 ==== tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts (2 errors) ====
@@ -11,10 +13,12 @@ tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS274
     
     fn((a, b) => true);
        ~~~~~~~~~~~~~~
-!!! error TS2741: Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
+!!! error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
+!!! error TS2345:   Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
 !!! related TS2728 tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts:2:5: 'x' is declared here.
     fn(function (a, b) { return true; })
        ~~~~~~~~
-!!! error TS2741: Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
+!!! error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'.
+!!! error TS2345:   Property 'x' is missing in type '(a: any, b: any) => boolean' but required in type 'IResultCallback'.
 !!! related TS2728 tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts:2:5: 'x' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
index 51963caa69bd3..0a7a3a2db5c4e 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
@@ -1,7 +1,9 @@
-tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2740: Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
+tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+  Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,31): error TS2558: Expected 0 type arguments, but got 1.
 tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,31): error TS2558: Expected 0 type arguments, but got 1.
-tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2739: Type 'Object' is missing the following properties from type 'Error': name, message
+tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+  Type 'Object' is missing the following properties from type 'Error': name, message
 
 
 ==== tests/cases/compiler/assigningFromObjectToAnythingElse.ts (4 errors) ====
@@ -9,7 +11,8 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2739: Ty
     var y: RegExp;
     y = x;
     ~
-!!! error TS2740: Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
+!!! error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+!!! error TS2696:   Type 'Object' is missing the following properties from type 'RegExp': exec, test, source, global, and 4 more.
     
     var a: String = Object.create<Object>("");
                                   ~~~~~~
@@ -20,5 +23,6 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2739: Ty
     
     var w: Error = new Object();
         ~
-!!! error TS2739: Type 'Object' is missing the following properties from type 'Error': name, message
+!!! error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+!!! error TS2696:   Type 'Object' is missing the following properties from type 'Error': name, message
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
index eba869f56ecec..870c5f8839dea 100644
--- a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
+++ b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
@@ -1,6 +1,7 @@
 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(4,17): error TS2322: Type 'false' is not assignable to type 'string'.
-tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS2741: Property 'id' is missing in type '{ name: string; }' but required in type '{ id: number; name?: string; }'.
+tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS2345: Argument of type '{ name: string; }' is not assignable to parameter of type '{ id: number; name?: string; }'.
+  Property 'id' is missing in type '{ name: string; }' but required in type '{ id: number; name?: string; }'.
 
 
 ==== tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts (3 errors) ====
@@ -15,5 +16,6 @@ tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts(5,5): error TS
 !!! related TS6500 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts:1:31: The expected type comes from property 'name' which is declared here on type '{ id: number; name?: string; }'
     foo({ name: "hello" });            // Error, id required but missing
         ~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'id' is missing in type '{ name: string; }' but required in type '{ id: number; name?: string; }'.
+!!! error TS2345: Argument of type '{ name: string; }' is not assignable to parameter of type '{ id: number; name?: string; }'.
+!!! error TS2345:   Property 'id' is missing in type '{ name: string; }' but required in type '{ id: number; name?: string; }'.
 !!! related TS2728 tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts:1:19: 'id' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
index 8a7230b32b154..cc61e0ebfe475 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt
@@ -5,7 +5,8 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Applicable'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
-tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(25,4): error TS2741: Property 'apply' is missing in type '{}' but required in type 'Applicable'.
+tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(25,4): error TS2345: Argument of type '{}' is not assignable to parameter of type 'Applicable'.
+  Property 'apply' is missing in type '{}' but required in type 'Applicable'.
 
 
 ==== tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts (8 errors) ====
@@ -51,7 +52,8 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'Applicable'.
     fn({});
        ~~
-!!! error TS2741: Property 'apply' is missing in type '{}' but required in type 'Applicable'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'Applicable'.
+!!! error TS2345:   Property 'apply' is missing in type '{}' but required in type 'Applicable'.
 !!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts:4:5: 'apply' is declared here.
     
     
diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
index 1fa288093563a..d1894692635a5 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt
@@ -5,7 +5,8 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type '""' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(23,4): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'Callable'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(24,4): error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
-tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(25,4): error TS2741: Property 'call' is missing in type '{}' but required in type 'Callable'.
+tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(25,4): error TS2345: Argument of type '{}' is not assignable to parameter of type 'Callable'.
+  Property 'call' is missing in type '{}' but required in type 'Callable'.
 
 
 ==== tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts (8 errors) ====
@@ -51,7 +52,8 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'Callable'.
     fn({});
        ~~
-!!! error TS2741: Property 'call' is missing in type '{}' but required in type 'Callable'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'Callable'.
+!!! error TS2345:   Property 'call' is missing in type '{}' but required in type 'Callable'.
 !!! related TS2728 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts:4:5: 'call' is declared here.
     
     
diff --git a/tests/baselines/reference/castingTuple.errors.txt b/tests/baselines/reference/castingTuple.errors.txt
index c58cf17cd98a7..4587612cb7648 100644
--- a/tests/baselines/reference/castingTuple.errors.txt
+++ b/tests/baselines/reference/castingTuple.errors.txt
@@ -1,9 +1,11 @@
-tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2741: Property '2' is missing in type '[number, string]' but required in type '[number, string, boolean]'.
+tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property '2' is missing in type '[number, string]' but required in type '[number, string, boolean]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(14,15): error TS2352: Conversion of type '[number, string, boolean]' to type '[number, string]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Types of property 'length' are incompatible.
     Type '3' is not comparable to type '2'.
 tests/cases/conformance/types/tuple/castingTuple.ts(15,14): error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-tests/cases/conformance/types/tuple/castingTuple.ts(18,21): error TS2741: Property '2' is missing in type '[C, D]' but required in type '[C, D, A]'.
+tests/cases/conformance/types/tuple/castingTuple.ts(18,21): error TS2352: Conversion of type '[C, D]' to type '[C, D, A]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property '2' is missing in type '[C, D]' but required in type '[C, D, A]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(20,33): error TS2339: Property '5' does not exist on type '[C, D, A]'.
 tests/cases/conformance/types/tuple/castingTuple.ts(30,10): error TS2352: Conversion of type '[number, string]' to type '[number, number]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Type 'string' is not comparable to type 'number'.
@@ -28,7 +30,8 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var emptyObjTuple = <[{}, {}]>numStrTuple;
     var numStrBoolTuple = <[number, string, boolean]>numStrTuple;
                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property '2' is missing in type '[number, string]' but required in type '[number, string, boolean]'.
+!!! error TS2352: Conversion of type '[number, string]' to type '[number, string, boolean]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property '2' is missing in type '[number, string]' but required in type '[number, string, boolean]'.
     var shorter = numStrBoolTuple as [number, string]
                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Conversion of type '[number, string, boolean]' to type '[number, string]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
@@ -41,7 +44,8 @@ tests/cases/conformance/types/tuple/castingTuple.ts(33,1): error TS2304: Cannot
     var interfaceIITuple = <[I, I]>classCDTuple;
     var classCDATuple = <[C, D, A]>classCDTuple;
                         ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property '2' is missing in type '[C, D]' but required in type '[C, D, A]'.
+!!! error TS2352: Conversion of type '[C, D]' to type '[C, D, A]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property '2' is missing in type '[C, D]' but required in type '[C, D, A]'.
     var eleFromCDA1 = classCDATuple[2]; // A
     var eleFromCDA2 = classCDATuple[5]; // C | D | A
                                     ~
diff --git a/tests/baselines/reference/constraints0.errors.txt b/tests/baselines/reference/constraints0.errors.txt
index b556e234bd110..4759fcfbe1462 100644
--- a/tests/baselines/reference/constraints0.errors.txt
+++ b/tests/baselines/reference/constraints0.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/constraints0.ts(14,11): error TS2741: Property 'a' is missing in type 'B' but required in type 'A'.
+tests/cases/compiler/constraints0.ts(14,11): error TS2344: Type 'B' does not satisfy the constraint 'A'.
+  Property 'a' is missing in type 'B' but required in type 'A'.
 
 
 ==== tests/cases/compiler/constraints0.ts (1 errors) ====
@@ -17,7 +18,8 @@ tests/cases/compiler/constraints0.ts(14,11): error TS2741: Property 'a' is missi
     var v1: C<A>; // should work
     var v2: C<B>; // should not work
               ~
-!!! error TS2741: Property 'a' is missing in type 'B' but required in type 'A'.
+!!! error TS2344: Type 'B' does not satisfy the constraint 'A'.
+!!! error TS2344:   Property 'a' is missing in type 'B' but required in type 'A'.
 !!! related TS2728 tests/cases/compiler/constraints0.ts:2:2: 'a' is declared here.
     
     var y = v1.x.a; // 'a' should be of type 'number'
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
index 7c1d1fa5d7fd5..49c45b4a6f9fc 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6): error TS2740: Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6): error TS2345: Argument of type 'C' is not assignable to parameter of type 'Function'.
+  Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
 
 
 ==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts (1 errors) ====
@@ -7,5 +8,6 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6)
     class C {
         @dec method() {}
          ~~~
-!!! error TS2740: Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
+!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'Function'.
+!!! error TS2345:   Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
index 2a06988e1b22f..6338e3d938c83 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
@@ -9,7 +9,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(30,14): error TS2300: Duplicate identifier 'z'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(30,18): error TS2300: Duplicate identifier 'z'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(34,6): error TS2322: Type 'number' is not assignable to type '{ x: any; y: { j: any; }; }'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(35,4): error TS2741: Property 'z' is missing in type '{}' but required in type '{ z: number; }'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(35,4): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ z: number; }'.
+  Property 'z' is missing in type '{}' but required in type '{ z: number; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(36,6): error TS2322: Type 'true' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(37,6): error TS2322: Type 'false' is not assignable to type 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(38,6): error TS2322: Type 'true' is not assignable to type 'string | number'.
@@ -85,7 +86,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2322: Type 'number' is not assignable to type '{ x: any; y: { j: any; }; }'.
     c1({});            // Error, implied type is {z:number}?
        ~~
-!!! error TS2741: Property 'z' is missing in type '{}' but required in type '{ z: number; }'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type '{ z: number; }'.
+!!! error TS2345:   Property 'z' is missing in type '{}' but required in type '{ z: number; }'.
 !!! related TS2728 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts:27:21: 'z' is declared here.
     c1({ z: true });   // Error, implied type is {z:number}?
          ~
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
index a5e5a861b402a..bb8b5fe8eb240 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.errors.txt
@@ -2,7 +2,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(30,5): error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts(30,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
+  Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.ts (3 errors) ====
@@ -43,7 +44,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5.
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
+!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
+!!! error TS2345:   Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
index 2ef3530781b49..ed67aa9cf2157 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.errors.txt
@@ -2,7 +2,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5i
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(30,5): error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts(30,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
+  Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5iterable.ts (3 errors) ====
@@ -43,7 +44,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES5i
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
+!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
+!!! error TS2345:   Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
index 3d8fd8338218e..d79be518a2488 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.errors.txt
@@ -2,7 +2,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.
   Types of property 'length' are incompatible.
     Type '5' is not assignable to type '3'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(29,12): error TS2322: Type 'number' is not assignable to type '[[any]]'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(30,5): error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts(30,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
+  Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.ts (3 errors) ====
@@ -43,7 +44,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration3ES6.
 !!! error TS2322: Type 'number' is not assignable to type '[[any]]'.
     a10([1, 2]);                              // Parameter type is any[]
         ~~~~~~
-!!! error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
+!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]], ...any[]]'.
+!!! error TS2345:   Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]], ...any[]]'.
     a11([1, 2]);                              // Parameter type is number[]
     
     // Rest parameter with generic
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
index d22da7f4dc664..e51ee68b60414 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
@@ -3,7 +3,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(20,19): error TS2345: Argument of type 'true' is not assignable to parameter of type 'string | number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(21,7): error TS2552: Cannot find name 'array2'. Did you mean 'Array'?
 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 TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[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]' but required in type '[any, any, [[any]]]'.
 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'.
@@ -46,7 +47,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 !!! error TS2322: Type 'string' is not assignable to type '[[any]]'.
     a5([1, 2]);                              // Error, parameter type is [any, any, [[any]]]
        ~~~~~~
-!!! error TS2741: Property '2' is missing in type '[number, number]' but required in type '[any, any, [[any]]]'.
+!!! 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]' but required in type '[any, any, [[any]]]'.
     a6([1, 2, "string"]);                   // Error, parameter type is number[]
               ~~~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
index 319402b6697a4..5514e7efc645e 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(47,6): error TS2741: Property 'foo' is missing in type 'Class' but required in type 'D'.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2741: Property 'y' is missing in type '{}' but required in type '{ y: D; }'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ y: D; }'.
+  Property 'y' is missing in type '{}' but required in type '{ y: D; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(49,6): error TS2322: Type 'number' is not assignable to type 'D'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(50,6): error TS2322: Type 'string' is not assignable to type 'D'.
 
@@ -58,7 +59,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(
 !!! related TS6500 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: The expected type comes from property 'y' which is declared here on type '{ y: D; }'
     d3({});
        ~~
-!!! error TS2741: Property 'y' is missing in type '{}' but required in type '{ y: D; }'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type '{ y: D; }'.
+!!! error TS2345:   Property 'y' is missing in type '{}' but required in type '{ y: D; }'.
 !!! related TS2728 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts:29:33: 'y' is declared here.
     d3({ y: 1 });
          ~
diff --git a/tests/baselines/reference/differentTypesWithSameName.errors.txt b/tests/baselines/reference/differentTypesWithSameName.errors.txt
index 786e22d7a8acf..b027d5be93efb 100644
--- a/tests/baselines/reference/differentTypesWithSameName.errors.txt
+++ b/tests/baselines/reference/differentTypesWithSameName.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2741: Property 's' is missing in type 'variable' but required in type 'variable'.
+tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'.
+  Property 's' is missing in type 'variable' but required in type 'variable'.
 
 
 ==== tests/cases/compiler/differentTypesWithSameName.ts (1 errors) ====
@@ -19,5 +20,6 @@ tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2741: Propert
     var v: variable = new variable();
     m.doSomething(v);
                   ~
-!!! error TS2741: Property 's' is missing in type 'variable' but required in type 'variable'.
+!!! error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'.
+!!! error TS2345:   Property 's' is missing in type 'variable' but required in type 'variable'.
 !!! related TS2728 tests/cases/compiler/differentTypesWithSameName.ts:3:5: 's' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
index ef879f002c9d5..a57764e4004ed 100644
--- a/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
+++ b/tests/baselines/reference/exportDefaultStripsFreshness.errors.txt
@@ -1,5 +1,7 @@
-tests/cases/compiler/index.ts(10,6): error TS2741: Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
-tests/cases/compiler/index.ts(12,6): error TS2741: Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
+tests/cases/compiler/index.ts(10,6): error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
+  Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
+tests/cases/compiler/index.ts(12,6): error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
+  Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
 
 
 ==== tests/cases/compiler/items.ts (0 errors) ====
@@ -22,11 +24,13 @@ tests/cases/compiler/index.ts(12,6): error TS2741: Property 'foo' is missing in
     
     nFoo(q); // for comparison
          ~
-!!! error TS2741: Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
+!!! error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
+!!! error TS2345:   Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
 !!! related TS2728 tests/cases/compiler/index.ts:4:5: 'foo' is declared here.
     
     nFoo(B);
          ~
-!!! error TS2741: Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
+!!! error TS2345: Argument of type '{ foob: string; }' is not assignable to parameter of type 'IFoo'.
+!!! error TS2345:   Property 'foo' is missing in type '{ foob: string; }' but required in type 'IFoo'.
 !!! related TS2728 tests/cases/compiler/index.ts:4:5: 'foo' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index 08451a59865b2..b935293973e18 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -2,7 +2,8 @@ tests/cases/compiler/fuzzy.ts(13,18): error TS2420: Class 'C' incorrectly implem
   Property 'alsoWorks' is missing in type 'C' but required in type 'I'.
 tests/cases/compiler/fuzzy.ts(21,34): error TS2322: Type 'this' is not assignable to type 'I'.
   Type 'C' is not assignable to type 'I'.
-tests/cases/compiler/fuzzy.ts(25,20): error TS2741: Property 'anything' is missing in type '{ oneI: this; }' but required in type 'R'.
+tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Conversion of type '{ oneI: this; }' to type 'R' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'anything' is missing in type '{ oneI: this; }' but required in type 'R'.
 
 
 ==== tests/cases/compiler/fuzzy.ts (3 errors) ====
@@ -40,7 +41,8 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2741: Property 'anything' is missi
             worksToo():R {
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'anything' is missing in type '{ oneI: this; }' but required in type 'R'.
+!!! error TS2352: Conversion of type '{ oneI: this; }' to type 'R' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'anything' is missing in type '{ oneI: this; }' but required in type 'R'.
 !!! related TS2728 tests/cases/compiler/fuzzy.ts:9:9: 'anything' is declared here.
             }
         }
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
index 169d875b84f34..08b5dbc177136 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2741: Property 'y' is missing in type 'C' but required in type 'D'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
+  Property 'y' is missing in type 'C' but required in type 'D'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'.
 
 
@@ -23,7 +24,8 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var r = foo(c, d);
     var r2 = foo(d, c); // error because C does not extend D
                     ~
-!!! error TS2741: Property 'y' is missing in type 'C' but required in type 'D'.
+!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
+!!! error TS2345:   Property 'y' is missing in type 'C' but required in type 'D'.
 !!! related TS2728 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts:9:5: 'y' is declared here.
     var r3 = foo(c, { x: '', foo: c });
     var r4 = foo(null, null);
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
index a9778afd592dc..0fd0f98209aa9 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2741: Property 'y' is missing in type 'C' but required in type 'D'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
+  Property 'y' is missing in type 'C' but required in type 'D'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(19,23): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
   Type 'void' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'.
@@ -24,7 +25,8 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj
     var d: D;
     var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
                     ~
-!!! error TS2741: Property 'y' is missing in type 'C' but required in type 'D'.
+!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
+!!! error TS2345:   Property 'y' is missing in type 'C' but required in type 'D'.
 !!! related TS2728 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts:9:5: 'y' is declared here.
     var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
                           ~~~~~~~~~
diff --git a/tests/baselines/reference/genericConstraint2.errors.txt b/tests/baselines/reference/genericConstraint2.errors.txt
index 3a87349d42acd..8db18fc3e54b5 100644
--- a/tests/baselines/reference/genericConstraint2.errors.txt
+++ b/tests/baselines/reference/genericConstraint2.errors.txt
@@ -1,6 +1,7 @@
 tests/cases/compiler/genericConstraint2.ts(11,7): error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable<string>'.
   Property 'comparer' is missing in type 'ComparableString' but required in type 'Comparable<string>'.
-tests/cases/compiler/genericConstraint2.ts(21,17): error TS2741: Property 'comparer' is missing in type 'ComparableString' but required in type 'Comparable<ComparableString>'.
+tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable<ComparableString>'.
+  Property 'comparer' is missing in type 'ComparableString' but required in type 'Comparable<ComparableString>'.
 
 
 ==== tests/cases/compiler/genericConstraint2.ts (2 errors) ====
@@ -30,5 +31,6 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2741: Property 'compa
     var b = new ComparableString("b");
     var c = compare<ComparableString>(a, b);
                     ~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'comparer' is missing in type 'ComparableString' but required in type 'Comparable<ComparableString>'.
+!!! error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable<ComparableString>'.
+!!! error TS2344:   Property 'comparer' is missing in type 'ComparableString' but required in type 'Comparable<ComparableString>'.
 !!! related TS2728 tests/cases/compiler/genericConstraint2.ts:2:5: 'comparer' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index ad0f6bb625a51..f9af3c54555c7 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -20,11 +20,16 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(30,21): error TS234
 tests/cases/conformance/types/rest/genericRestParameters3.ts(31,21): error TS2345: Argument of type '<T extends any[]>(cb: (...args: T) => void) => void' is not assignable to parameter of type '(...args: CoolArray<any>) => void'.
   Types of parameters 'cb' and 'args' are incompatible.
     Property '0' is missing in type 'CoolArray<any>' but required in type '[(...args: any[]) => void]'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(38,32): error TS2741: Property 'hello' is missing in type '[10, 20]' but required in type 'CoolArray<number>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(43,1): error TS2741: Property 'hello' is missing in type '[]' but required in type 'CoolArray<never>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(44,5): error TS2741: Property 'hello' is missing in type '[number]' but required in type 'CoolArray<{}>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(45,5): error TS2741: Property 'hello' is missing in type '[number, number]' but required in type 'CoolArray<{}>'.
-tests/cases/conformance/types/rest/genericRestParameters3.ts(46,5): error TS2741: Property 'hello' is missing in type 'number[]' but required in type 'CoolArray<number>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(38,32): error TS2345: Argument of type '[10, 20]' is not assignable to parameter of type 'CoolArray<number>'.
+  Property 'hello' is missing in type '[10, 20]' but required in type 'CoolArray<number>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(43,1): error TS2345: Argument of type '[]' is not assignable to parameter of type 'CoolArray<never>'.
+  Property 'hello' is missing in type '[]' but required in type 'CoolArray<never>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(44,5): error TS2345: Argument of type '[number]' is not assignable to parameter of type 'CoolArray<{}>'.
+  Property 'hello' is missing in type '[number]' but required in type 'CoolArray<{}>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(45,5): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type 'CoolArray<{}>'.
+  Property 'hello' is missing in type '[number, number]' but required in type 'CoolArray<{}>'.
+tests/cases/conformance/types/rest/genericRestParameters3.ts(46,5): error TS2345: Argument of type 'number[]' is not assignable to parameter of type 'CoolArray<number>'.
+  Property 'hello' is missing in type 'number[]' but required in type 'CoolArray<number>'.
 tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345: Argument of type '["what"]' is not assignable to parameter of type '[] | [number, string]'.
   Property '1' is missing in type '["what"]' but required in type '[number, string]'.
 
@@ -101,7 +106,8 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     let a = bar(10, 20);
     let b = bar<CoolArray<number>>(10, 20);  // Error
                                    ~~
-!!! error TS2741: Property 'hello' is missing in type '[10, 20]' but required in type 'CoolArray<number>'.
+!!! error TS2345: Argument of type '[10, 20]' is not assignable to parameter of type 'CoolArray<number>'.
+!!! error TS2345:   Property 'hello' is missing in type '[10, 20]' but required in type 'CoolArray<number>'.
 !!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     
     declare function baz<T>(...args: CoolArray<T>): void;
@@ -109,19 +115,23 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     
     baz();       // Error
     ~~~~~
-!!! error TS2741: Property 'hello' is missing in type '[]' but required in type 'CoolArray<never>'.
+!!! error TS2345: Argument of type '[]' is not assignable to parameter of type 'CoolArray<never>'.
+!!! error TS2345:   Property 'hello' is missing in type '[]' but required in type 'CoolArray<never>'.
 !!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     baz(1);      // Error
         ~
-!!! error TS2741: Property 'hello' is missing in type '[number]' but required in type 'CoolArray<{}>'.
+!!! error TS2345: Argument of type '[number]' is not assignable to parameter of type 'CoolArray<{}>'.
+!!! error TS2345:   Property 'hello' is missing in type '[number]' but required in type 'CoolArray<{}>'.
 !!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     baz(1, 2);   // Error
         ~
-!!! error TS2741: Property 'hello' is missing in type '[number, number]' but required in type 'CoolArray<{}>'.
+!!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type 'CoolArray<{}>'.
+!!! error TS2345:   Property 'hello' is missing in type '[number, number]' but required in type 'CoolArray<{}>'.
 !!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     baz(...ca);  // Error
         ~~~~~
-!!! error TS2741: Property 'hello' is missing in type 'number[]' but required in type 'CoolArray<number>'.
+!!! error TS2345: Argument of type 'number[]' is not assignable to parameter of type 'CoolArray<number>'.
+!!! error TS2345:   Property 'hello' is missing in type 'number[]' but required in type 'CoolArray<number>'.
 !!! related TS2728 tests/cases/conformance/types/rest/genericRestParameters3.ts:24:5: 'hello' is declared here.
     
     // Repro from #26491
diff --git a/tests/baselines/reference/genericTypeAssertions2.errors.txt b/tests/baselines/reference/genericTypeAssertions2.errors.txt
index c730ad2a0c1a0..6c72ca1a773d5 100644
--- a/tests/baselines/reference/genericTypeAssertions2.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions2.errors.txt
@@ -4,7 +4,8 @@ tests/cases/compiler/genericTypeAssertions2.ts(10,5): error TS2322: Type 'B<stri
       Types of parameters 'x' and 'x' are incompatible.
         Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericTypeAssertions2.ts(11,5): error TS2741: Property 'bar' is missing in type 'A<number>' but required in type 'B<number>'.
-tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2741: Property 'foo' is missing in type 'undefined[]' but required in type 'A<number>'.
+tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Conversion of type 'undefined[]' to type 'A<number>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'foo' is missing in type 'undefined[]' but required in type 'A<number>'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions2.ts (3 errors) ====
@@ -31,5 +32,6 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2741: Property 'f
     var r4: A<number> = <A<number>>new A();
     var r5: A<number> = <A<number>>[]; // error
                         ~~~~~~~~~~~~~
-!!! error TS2741: Property 'foo' is missing in type 'undefined[]' but required in type 'A<number>'.
+!!! error TS2352: Conversion of type 'undefined[]' to type 'A<number>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'foo' is missing in type 'undefined[]' but required in type 'A<number>'.
 !!! related TS2728 tests/cases/compiler/genericTypeAssertions2.ts:1:14: 'foo' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeConstraints.errors.txt b/tests/baselines/reference/genericTypeConstraints.errors.txt
index 8b6a6201585a5..d3d424c6383ea 100644
--- a/tests/baselines/reference/genericTypeConstraints.errors.txt
+++ b/tests/baselines/reference/genericTypeConstraints.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2741: Property 'fooMethod' is missing in type 'FooExtended' but required in type 'Foo'.
+tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
+  Property 'fooMethod' is missing in type 'FooExtended' but required in type 'Foo'.
 
 
 ==== tests/cases/compiler/genericTypeConstraints.ts (1 errors) ====
@@ -12,7 +13,8 @@ tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2741: Property 'fo
     
     class BarExtended extends Bar<FooExtended> {
                                   ~~~~~~~~~~~
-!!! error TS2741: Property 'fooMethod' is missing in type 'FooExtended' but required in type 'Foo'.
+!!! error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
+!!! error TS2344:   Property 'fooMethod' is missing in type 'FooExtended' but required in type 'Foo'.
 !!! related TS2728 tests/cases/compiler/genericTypeConstraints.ts:2:5: 'fooMethod' is declared here.
         constructor() {
             super();
diff --git a/tests/baselines/reference/generics1.errors.txt b/tests/baselines/reference/generics1.errors.txt
index 79cdd7184104e..2fbc588b516fc 100644
--- a/tests/baselines/reference/generics1.errors.txt
+++ b/tests/baselines/reference/generics1.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/generics1.ts(10,14): error TS2741: Property 'b' is missing in type 'A' but required in type 'B'.
+tests/cases/compiler/generics1.ts(10,14): error TS2344: Type 'A' does not satisfy the constraint 'B'.
+  Property 'b' is missing in type 'A' but required in type 'B'.
 tests/cases/compiler/generics1.ts(13,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 
@@ -15,7 +16,8 @@ tests/cases/compiler/generics1.ts(14,9): error TS2314: Generic type 'G<T, U>' re
     var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2741: Property 'b' is missing in type 'A' but required in type 'B'.
+!!! error TS2344: Type 'A' does not satisfy the constraint 'B'.
+!!! error TS2344:   Property 'b' is missing in type 'A' but required in type 'B'.
 !!! related TS2728 tests/cases/compiler/generics1.ts:2:25: 'b' is declared here.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
diff --git a/tests/baselines/reference/generics2.errors.txt b/tests/baselines/reference/generics2.errors.txt
index b13dcac222fe4..765eb88f3efe3 100644
--- a/tests/baselines/reference/generics2.errors.txt
+++ b/tests/baselines/reference/generics2.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/generics2.ts(17,14): error TS2741: Property 'b' is missing in type 'A' but required in type 'B'.
+tests/cases/compiler/generics2.ts(17,14): error TS2344: Type 'A' does not satisfy the constraint 'B'.
+  Property 'b' is missing in type 'A' but required in type 'B'.
 tests/cases/compiler/generics2.ts(20,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' requires 2 type argument(s).
 
@@ -22,7 +23,8 @@ tests/cases/compiler/generics2.ts(21,9): error TS2314: Generic type 'G<T, U>' re
     var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2741: Property 'b' is missing in type 'A' but required in type 'B'.
+!!! error TS2344: Type 'A' does not satisfy the constraint 'B'.
+!!! error TS2344:   Property 'b' is missing in type 'A' but required in type 'B'.
 !!! related TS2728 tests/cases/compiler/generics2.ts:2:25: 'b' is declared here.
     var v4: G<G<A, B>, C>;         // Ok
     var v5: G<any, any>;           // Error, any does not satisfy constraint B
diff --git a/tests/baselines/reference/generics5.errors.txt b/tests/baselines/reference/generics5.errors.txt
index 168c27e3c89b1..153ebb3823e3a 100644
--- a/tests/baselines/reference/generics5.errors.txt
+++ b/tests/baselines/reference/generics5.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/generics5.ts(10,14): error TS2741: Property 'b' is missing in type 'A' but required in type 'B'.
+tests/cases/compiler/generics5.ts(10,14): error TS2344: Type 'A' does not satisfy the constraint 'B'.
+  Property 'b' is missing in type 'A' but required in type 'B'.
 
 
 ==== tests/cases/compiler/generics5.ts (1 errors) ====
@@ -13,7 +14,8 @@ tests/cases/compiler/generics5.ts(10,14): error TS2741: Property 'b' is missing
     
     var v3: G<A, A>;               // Error, A not valid argument for U
                  ~
-!!! error TS2741: Property 'b' is missing in type 'A' but required in type 'B'.
+!!! error TS2344: Type 'A' does not satisfy the constraint 'B'.
+!!! error TS2344:   Property 'b' is missing in type 'A' but required in type 'B'.
 !!! related TS2728 tests/cases/compiler/generics5.ts:2:25: 'b' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
index c920798c18d48..e61cef4c822a8 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
@@ -3,7 +3,8 @@ tests/cases/conformance/jsx/inline/index.tsx(21,22): error TS2322: Type '{ child
   Types of property 'children' are incompatible.
     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
-tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2741: Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
+tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
+  Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
 tests/cases/conformance/jsx/inline/index.tsx(21,63): error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
 tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ children: Element[]; x: number; y: number; }' is not assignable to type '{ x: number; y: number; children?: Element[]; }'.
   Types of property 'children' are incompatible.
@@ -102,7 +103,8 @@ tests/cases/conformance/jsx/inline/index.tsx(24,23): error TS2322: Type '{ child
 !!! error TS2322:     Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element[]' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element[]'.
 !!! error TS2322:       Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
+!!! error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
+!!! error TS2605:   Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
 !!! related TS2728 tests/cases/conformance/jsx/inline/renderer.d.ts:7:13: '__domBrand' is declared here.
                                                                   ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2605: JSX element type 'MyClass' is not a constructor function for JSX elements.
diff --git a/tests/baselines/reference/intTypeCheck.errors.txt b/tests/baselines/reference/intTypeCheck.errors.txt
index c24bd5831f6e2..326ad2f18cd50 100644
--- a/tests/baselines/reference/intTypeCheck.errors.txt
+++ b/tests/baselines/reference/intTypeCheck.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/compiler/intTypeCheck.ts(35,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/intTypeCheck.ts(71,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/intTypeCheck.ts(85,5): error TS2386: Overload signatures must all be optional or required.
-tests/cases/compiler/intTypeCheck.ts(99,5): error TS2739: Type 'Object' is missing the following properties from type 'i1': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(99,5): error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+  Type 'Object' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(100,16): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/intTypeCheck.ts(101,5): error TS2739: Type 'Base' is missing the following properties from type 'i1': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(103,5): error TS2739: Type '() => void' is missing the following properties from type 'i1': p, p3, p6
@@ -40,7 +41,8 @@ tests/cases/compiler/intTypeCheck.ts(148,21): error TS1109: Expression expected.
 tests/cases/compiler/intTypeCheck.ts(148,22): error TS2693: 'i4' only refers to a type, but is being used as a value here.
 tests/cases/compiler/intTypeCheck.ts(149,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/intTypeCheck.ts(154,5): error TS2739: Type '{}' is missing the following properties from type 'i5': p, p3, p6
-tests/cases/compiler/intTypeCheck.ts(155,5): error TS2739: Type 'Object' is missing the following properties from type 'i5': p, p3, p6
+tests/cases/compiler/intTypeCheck.ts(155,5): error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+  Type 'Object' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(156,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/intTypeCheck.ts(157,5): error TS2739: Type 'Base' is missing the following properties from type 'i5': p, p3, p6
 tests/cases/compiler/intTypeCheck.ts(159,5): error TS2739: Type '() => void' is missing the following properties from type 'i5': p, p3, p6
@@ -189,7 +191,8 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
     };
     var obj2: i1 = new Object();
         ~~~~
-!!! error TS2739: Type 'Object' is missing the following properties from type 'i1': p, p3, p6
+!!! error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+!!! error TS2696:   Type 'Object' is missing the following properties from type 'i1': p, p3, p6
     var obj3: i1 = new obj0;
                    ~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
@@ -314,7 +317,8 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
 !!! error TS2739: Type '{}' is missing the following properties from type 'i5': p, p3, p6
     var obj46: i5 = new Object();
         ~~~~~
-!!! error TS2739: Type 'Object' is missing the following properties from type 'i5': p, p3, p6
+!!! error TS2696: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
+!!! error TS2696:   Type 'Object' is missing the following properties from type 'i5': p, p3, p6
     var obj47: i5 = new obj44;
                     ~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
diff --git a/tests/baselines/reference/iterableArrayPattern10.errors.txt b/tests/baselines/reference/iterableArrayPattern10.errors.txt
index 814d2f1a4c0ec..9ec39f0ef955c 100644
--- a/tests/baselines/reference/iterableArrayPattern10.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern10.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts(17,5): error TS2740: Type 'FooIterator' is missing the following properties from type '[any, any]': 0, 1, length, pop, and 26 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, any]'.
+  Type 'FooIterator' is missing the following properties from type '[any, any]': 0, 1, length, pop, and 26 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts (1 errors) ====
@@ -20,4 +21,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts(17,5): error
     function fun([a, b]) { }
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2740: Type 'FooIterator' is missing the following properties from type '[any, any]': 0, 1, length, pop, and 26 more.
\ No newline at end of file
+!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, any]'.
+!!! error TS2345:   Type 'FooIterator' is missing the following properties from type '[any, any]': 0, 1, length, pop, and 26 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern13.errors.txt b/tests/baselines/reference/iterableArrayPattern13.errors.txt
index 4949ec4785161..780efa0de7fd4 100644
--- a/tests/baselines/reference/iterableArrayPattern13.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern13.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts(17,5): error TS2740: Type 'FooIterator' is missing the following properties from type '[any, ...any[]]': 0, length, pop, push, and 25 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, ...any[]]'.
+  Type 'FooIterator' is missing the following properties from type '[any, ...any[]]': 0, length, pop, push, and 25 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts (1 errors) ====
@@ -20,4 +21,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts(17,5): error
     function fun([a, ...b]) { }
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2740: Type 'FooIterator' is missing the following properties from type '[any, ...any[]]': 0, length, pop, push, and 25 more.
\ No newline at end of file
+!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[any, ...any[]]'.
+!!! error TS2345:   Type 'FooIterator' is missing the following properties from type '[any, ...any[]]': 0, length, pop, push, and 25 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern16.errors.txt b/tests/baselines/reference/iterableArrayPattern16.errors.txt
index 689aee97cc350..78adabcad59d7 100644
--- a/tests/baselines/reference/iterableArrayPattern16.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern16.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(1,17): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,5): error TS2740: Type 'FooIterator' is missing the following properties from type '[Bar, Bar]': 0, 1, length, pop, and 26 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[Bar, Bar]'.
+  Type 'FooIterator' is missing the following properties from type '[Bar, Bar]': 0, 1, length, pop, and 26 more.
 tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,12): error TS2449: Class 'FooIteratorIterator' used before its declaration.
 
 
@@ -9,7 +10,8 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts(2,12): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     fun(...new FooIteratorIterator);
         ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2740: Type 'FooIterator' is missing the following properties from type '[Bar, Bar]': 0, 1, length, pop, and 26 more.
+!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type '[Bar, Bar]'.
+!!! error TS2345:   Type 'FooIterator' is missing the following properties from type '[Bar, Bar]': 0, 1, length, pop, and 26 more.
                ~~~~~~~~~~~~~~~~~~~
 !!! error TS2449: Class 'FooIteratorIterator' used before its declaration.
 !!! related TS2728 tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts:18:7: 'FooIteratorIterator' is declared here.
diff --git a/tests/baselines/reference/iterableArrayPattern17.errors.txt b/tests/baselines/reference/iterableArrayPattern17.errors.txt
index 239dba3fa60d9..4de8c2a817274 100644
--- a/tests/baselines/reference/iterableArrayPattern17.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern17.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(16,17): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error TS2741: Property 'x' is missing in type 'FooIterator' but required in type 'Bar'.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar'.
+  Property 'x' is missing in type 'FooIterator' but required in type 'Bar'.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts (2 errors) ====
@@ -23,5 +24,6 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts(17,5): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'x' is missing in type 'FooIterator' but required in type 'Bar'.
+!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar'.
+!!! error TS2345:   Property 'x' is missing in type 'FooIterator' but required in type 'Bar'.
 !!! related TS2728 tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts:1:13: 'x' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern18.errors.txt b/tests/baselines/reference/iterableArrayPattern18.errors.txt
index b3a752ffeda03..7819c6c474173 100644
--- a/tests/baselines/reference/iterableArrayPattern18.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern18.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts(17,5): error TS2740: Type 'FooIterator' is missing the following properties from type 'Bar[]': length, pop, push, concat, and 24 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts(17,5): error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar[]'.
+  Type 'FooIterator' is missing the following properties from type 'Bar[]': length, pop, push, concat, and 24 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts (1 errors) ====
@@ -20,4 +21,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts(17,5): error
     function fun([a, b]: Bar[]) { }
     fun(new FooIterator);
         ~~~~~~~~~~~~~~~
-!!! error TS2740: Type 'FooIterator' is missing the following properties from type 'Bar[]': length, pop, push, concat, and 24 more.
\ No newline at end of file
+!!! error TS2345: Argument of type 'FooIterator' is not assignable to parameter of type 'Bar[]'.
+!!! error TS2345:   Type 'FooIterator' is missing the following properties from type 'Bar[]': length, pop, push, concat, and 24 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern19.errors.txt b/tests/baselines/reference/iterableArrayPattern19.errors.txt
index eec1dcdd34799..a5f63ea55d6f1 100644
--- a/tests/baselines/reference/iterableArrayPattern19.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern19.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts(17,5): error TS2740: Type 'FooArrayIterator' is missing the following properties from type 'Bar[][]': length, pop, push, concat, and 24 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts(17,5): error TS2345: Argument of type 'FooArrayIterator' is not assignable to parameter of type 'Bar[][]'.
+  Type 'FooArrayIterator' is missing the following properties from type 'Bar[][]': length, pop, push, concat, and 24 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts (1 errors) ====
@@ -20,4 +21,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts(17,5): error
     function fun([[a], b]: Bar[][]) { }
     fun(new FooArrayIterator);
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2740: Type 'FooArrayIterator' is missing the following properties from type 'Bar[][]': length, pop, push, concat, and 24 more.
\ No newline at end of file
+!!! error TS2345: Argument of type 'FooArrayIterator' is not assignable to parameter of type 'Bar[][]'.
+!!! error TS2345:   Type 'FooArrayIterator' is missing the following properties from type 'Bar[][]': length, pop, push, concat, and 24 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/iterableArrayPattern26.errors.txt b/tests/baselines/reference/iterableArrayPattern26.errors.txt
index b9affde3987c2..021a404f8a39d 100644
--- a/tests/baselines/reference/iterableArrayPattern26.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern26.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(1,33): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(2,21): error TS2740: Type 'Map<string, number>' is missing the following properties from type '[string, number]': 0, 1, length, pop, and 22 more.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(2,21): error TS2345: Argument of type 'Map<string, number>' is not assignable to parameter of type '[string, number]'.
+  Type 'Map<string, number>' is missing the following properties from type '[string, number]': 0, 1, length, pop, and 22 more.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts (2 errors) ====
@@ -8,4 +9,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern26.ts(2,21): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2740: Type 'Map<string, number>' is missing the following properties from type '[string, number]': 0, 1, length, pop, and 22 more.
\ No newline at end of file
+!!! error TS2345: Argument of type 'Map<string, number>' is not assignable to parameter of type '[string, number]'.
+!!! error TS2345:   Type 'Map<string, number>' is missing the following properties from type '[string, number]': 0, 1, length, pop, and 22 more.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateTag3.errors.txt b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
index fd0912c71dc8e..d5b6032c9405d 100644
--- a/tests/baselines/reference/jsdocTemplateTag3.errors.txt
+++ b/tests/baselines/reference/jsdocTemplateTag3.errors.txt
@@ -1,6 +1,7 @@
 tests/cases/conformance/jsdoc/a.js(14,29): error TS2339: Property 'a' does not exist on type 'U'.
 tests/cases/conformance/jsdoc/a.js(14,35): error TS2339: Property 'b' does not exist on type 'U'.
-tests/cases/conformance/jsdoc/a.js(21,3): error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
+tests/cases/conformance/jsdoc/a.js(21,3): error TS2345: Argument of type '{ a: number; }' is not assignable to parameter of type '{ a: number; b: string; }'.
+  Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
 tests/cases/conformance/jsdoc/a.js(24,15): error TS2304: Cannot find name 'NoLongerAllowed'.
 tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type parameter name was expected without curly braces.
 
@@ -32,7 +33,8 @@ tests/cases/conformance/jsdoc/a.js(25,2): error TS1069: Unexpected token. A type
     f({ a: 12, b: 'hi', c: null }, undefined, { c: false, d: 12, b: undefined }, 101, 'nope');
     f({ a: 12  }, undefined, undefined, 101, 'nope');
       ~~~~~~~~~~
-!!! error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
+!!! error TS2345: Argument of type '{ a: number; }' is not assignable to parameter of type '{ a: number; b: string; }'.
+!!! error TS2345:   Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
 !!! related TS2728 tests/cases/conformance/jsdoc/a.js:2:28: 'b' is declared here.
     
     /**
diff --git a/tests/baselines/reference/jsdocTypeTagCast.errors.txt b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
index 9f07c6216b234..c82eabc65cd63 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.errors.txt
+++ b/tests/baselines/reference/jsdocTypeTagCast.errors.txt
@@ -1,8 +1,12 @@
 tests/cases/conformance/jsdoc/b.js(4,13): error TS2352: Conversion of type 'number' to type 'string' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-tests/cases/conformance/jsdoc/b.js(45,16): error TS2741: Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
-tests/cases/conformance/jsdoc/b.js(49,19): error TS2739: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
-tests/cases/conformance/jsdoc/b.js(51,17): error TS2741: Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
-tests/cases/conformance/jsdoc/b.js(52,17): error TS2741: Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
+tests/cases/conformance/jsdoc/b.js(45,16): error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
+tests/cases/conformance/jsdoc/b.js(49,19): error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
+tests/cases/conformance/jsdoc/b.js(51,17): error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
+tests/cases/conformance/jsdoc/b.js(52,17): error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
 tests/cases/conformance/jsdoc/b.js(58,1): error TS2322: Type 'SomeFakeClass' is not assignable to type 'SomeBase'.
   Types of property 'p' are incompatible.
     Type 'string | number' is not assignable to type 'number'.
@@ -66,22 +70,26 @@ tests/cases/conformance/jsdoc/b.js(67,8): error TS2454: Variable 'numOrStr' is u
     someBase = /** @type {SomeBase} */(someBase);
     someBase = /** @type {SomeBase} */(someOther); // Error
                    ~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
+!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
 !!! related TS2728 tests/cases/conformance/jsdoc/b.js:17:9: 'p' is declared here.
     
     someDerived = /** @type {SomeDerived} */(someDerived);
     someDerived = /** @type {SomeDerived} */(someBase);
     someDerived = /** @type {SomeDerived} */(someOther); // Error
                       ~~~~~~~~~~~~~~~~~~~
-!!! error TS2739: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
+!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
     
     someOther = /** @type {SomeOther} */(someDerived); // Error
                     ~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
+!!! error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
 !!! related TS2728 tests/cases/conformance/jsdoc/b.js:28:9: 'q' is declared here.
     someOther = /** @type {SomeOther} */(someBase); // Error
                     ~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
+!!! error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
 !!! related TS2728 tests/cases/conformance/jsdoc/b.js:28:9: 'q' is declared here.
     someOther = /** @type {SomeOther} */(someOther);
     
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 40950279ae3c8..0ae4ebc468121 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -21,7 +21,8 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(59,9): error TS2403: Su
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(75,45): error TS2741: Property 'y' is missing in type '{ x: number; }' but required in type 'Readonly<{ x: number; y: number; }>'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(75,45): error TS2345: Argument of type '{ x: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
+  Property 'y' is missing in type '{ x: number; }' but required in type 'Readonly<{ x: number; y: number; }>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(77,59): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
   Object literal may only specify known properties, and 'z' does not exist in type 'Readonly<{ x: number; y: number; }>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(83,58): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Partial<{ x: number; y: number; }>'.
@@ -155,7 +156,8 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(152,17): error TS2339:
     function f20() {
         let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
                                                 ~~~~~~~~
-!!! error TS2741: Property 'y' is missing in type '{ x: number; }' but required in type 'Readonly<{ x: number; y: number; }>'.
+!!! error TS2345: Argument of type '{ x: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
+!!! error TS2345:   Property 'y' is missing in type '{ x: number; }' but required in type 'Readonly<{ x: number; y: number; }>'.
 !!! related TS2728 tests/cases/conformance/types/mapped/mappedTypeErrors.ts:75:37: 'y' is declared here.
         let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
         let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
diff --git a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
index 5b416c3d227ac..4ba7f6ba09eac 100644
--- a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
+++ b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts(13,17): error TS2741: Property 'a' is missing in type 'B<T>' but required in type 'A<{}>'.
+tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts(13,17): error TS2345: Argument of type 'B<T>' is not assignable to parameter of type 'A<{}>'.
+  Property 'a' is missing in type 'B<T>' but required in type 'A<{}>'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts (1 errors) ====
@@ -16,7 +17,8 @@ tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeF
         if (x instanceof B) {
             acceptA(x);
                     ~
-!!! error TS2741: Property 'a' is missing in type 'B<T>' but required in type 'A<{}>'.
+!!! error TS2345: Argument of type 'B<T>' is not assignable to parameter of type 'A<{}>'.
+!!! error TS2345:   Property 'a' is missing in type 'B<T>' but required in type 'A<{}>'.
 !!! related TS2728 tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts:2:17: 'a' is declared here.
         }
     
diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt b/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
index 1fe386e063eed..f616693788cdc 100644
--- a/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
+++ b/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/noImplicitAnyInCastExpression.ts(15,2): error TS2739: Type '{ c: null; }' is missing the following properties from type 'IFoo': a, b
+tests/cases/compiler/noImplicitAnyInCastExpression.ts(15,2): error TS2352: Conversion of type '{ c: null; }' to type 'IFoo' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type '{ c: null; }' is missing the following properties from type 'IFoo': a, b
 
 
 ==== tests/cases/compiler/noImplicitAnyInCastExpression.ts (1 errors) ====
@@ -18,4 +19,5 @@ tests/cases/compiler/noImplicitAnyInCastExpression.ts(15,2): error TS2739: Type
     // Neither types is assignable to each other
     (<IFoo>{ c: null });
      ~~~~~~~~~~~~~~~~~
-!!! error TS2739: Type '{ c: null; }' is missing the following properties from type 'IFoo': a, b
\ No newline at end of file
+!!! error TS2352: Conversion of type '{ c: null; }' to type 'IFoo' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Type '{ c: null; }' is missing the following properties from type 'IFoo': a, b
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
index 8bd80ee37f204..2c81e20f47316 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.errors.txt
@@ -2,8 +2,10 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(8,6): error TS2
   Object literal may only specify known properties, and 'hello' does not exist in type 'I'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(10,17): error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I'.
   Object literal may only specify known properties, and 'what' does not exist in type 'I'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(11,4): error TS2741: Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(12,4): error TS2741: Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(11,4): error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
+  Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(12,4): error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
+  Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error TS2339: Property 'uhhh' does not exist on type 'string'.
 
 
@@ -26,11 +28,13 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts(13,36): error T
 !!! error TS2345:   Object literal may only specify known properties, and 'what' does not exist in type 'I'.
     f2({ toString: (s) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
+!!! error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
+!!! error TS2345:   Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
 !!! related TS2728 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts:2:5: 'value' is declared here.
     f2({ toString: (s: string) => s }) // error, missing property value from ArgsString
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
+!!! error TS2345: Argument of type '{ toString: (s: string) => string; }' is not assignable to parameter of type 'I'.
+!!! error TS2345:   Property 'value' is missing in type '{ toString: (s: string) => string; }' but required in type 'I'.
 !!! related TS2728 tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts:2:5: 'value' is declared here.
     f2({ value: '', toString: (s) => s.uhhh }) // error
                                        ~~~~
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
index a2bd5f804facc..41157c363eb59 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.errors.txt
@@ -1,6 +1,7 @@
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(8,6): error TS2345: Argument of type '{ hello: number; }' is not assignable to parameter of type 'I2'.
   Object literal may only specify known properties, and 'hello' does not exist in type 'I2'.
-tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(9,4): error TS2741: Property 'doStuff' is missing in type '{ value: string; }' but required in type 'I2'.
+tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(9,4): error TS2345: Argument of type '{ value: string; }' is not assignable to parameter of type 'I2'.
+  Property 'doStuff' is missing in type '{ value: string; }' but required in type 'I2'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(10,17): error TS2345: Argument of type '{ value: string; what: number; }' is not assignable to parameter of type 'I2'.
   Object literal may only specify known properties, and 'what' does not exist in type 'I2'.
 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(11,6): error TS2322: Type '(s: any) => any' is not assignable to type '() => string'.
@@ -22,7 +23,8 @@ tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts(13,17): error
 !!! error TS2345:   Object literal may only specify known properties, and 'hello' does not exist in type 'I2'.
     f2({ value: '' })
        ~~~~~~~~~~~~~
-!!! error TS2741: Property 'doStuff' is missing in type '{ value: string; }' but required in type 'I2'.
+!!! error TS2345: Argument of type '{ value: string; }' is not assignable to parameter of type 'I2'.
+!!! error TS2345:   Property 'doStuff' is missing in type '{ value: string; }' but required in type 'I2'.
 !!! related TS2728 tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts:3:5: 'doStuff' is declared here.
     f2({ value: '', what: 1 }) 
                     ~~~~~~~
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
index 85c7ad2916d64..f98bcfb1cefc7 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts(7,5): error TS2741: Property 'a' is missing in type '{ name: string; id: number; }' but required in type '{ a: string; id: number; }'.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts(7,5): error TS2345: Argument of type '{ name: string; id: number; }' is not assignable to parameter of type '{ a: string; id: number; }'.
+  Property 'a' is missing in type '{ name: string; id: number; }' but required in type '{ a: string; id: number; }'.
 
 
 ==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts (1 errors) ====
@@ -10,6 +11,7 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
     function foo(p: { a: string; id: number }) { }
     foo(person);  // error
         ~~~~~~
-!!! error TS2741: Property 'a' is missing in type '{ name: string; id: number; }' but required in type '{ a: string; id: number; }'.
+!!! error TS2345: Argument of type '{ name: string; id: number; }' is not assignable to parameter of type '{ a: string; id: number; }'.
+!!! error TS2345:   Property 'a' is missing in type '{ name: string; id: number; }' but required in type '{ a: string; id: number; }'.
 !!! related TS2728 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2.ts:6:19: 'a' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
index c91a8a3685123..b037b3e6c81a2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2741: Property 'y' is missing in type 'C3<T2>' but required in type 'C4'.
+tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2352: Conversion of type 'C3<T2>' to type 'C4' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'y' is missing in type 'C3<T2>' but required in type 'C4'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts (1 errors) ====
@@ -28,5 +29,6 @@ tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectType
     var c3: C3<T2>;
     <C4>c3; // Should fail (private x originates in the same declaration, but different types)
     ~~~~~~
-!!! error TS2741: Property 'y' is missing in type 'C3<T2>' but required in type 'C4'.
+!!! error TS2352: Conversion of type 'C3<T2>' to type 'C4' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'y' is missing in type 'C3<T2>' but required in type 'C4'.
 !!! related TS2728 tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts:21:5: 'y' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
index dcfcb2d601876..24476ecafd272 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,5): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,37): error TS2741: Property 'x' is missing in type 'D' but required in type 'A'.
+tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(14,37): error TS2345: Argument of type 'D' is not assignable to parameter of type 'A'.
+  Property 'x' is missing in type 'D' but required in type 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,5): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,38): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(18,27): error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
@@ -26,7 +27,8 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
         ~~~~~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
                                         ~
-!!! error TS2741: Property 'x' is missing in type 'D' but required in type 'A'.
+!!! error TS2345: Argument of type 'D' is not assignable to parameter of type 'A'.
+!!! error TS2345:   Property 'x' is missing in type 'D' but required in type 'A'.
 !!! related TS2728 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts:1:15: 'x' is declared here.
     
     var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fails, so first overload is picked.
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
index 55d183420d457..f64b02d9eda15 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/compiler/recursiveClassReferenceTest.ts(16,19): error TS2304: Cannot find name 'Element'.
 tests/cases/compiler/recursiveClassReferenceTest.ts(56,11): error TS2663: Cannot find name 'domNode'. Did you mean the instance member 'this.domNode'?
 tests/cases/compiler/recursiveClassReferenceTest.ts(88,36): error TS2663: Cannot find name 'mode'. Did you mean the instance member 'this.mode'?
-tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2741: Property 'getInitialState' is missing in type 'Window' but required in type 'IMode'.
+tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' is not assignable to parameter of type 'IMode'.
+  Property 'getInitialState' is missing in type 'Window' but required in type 'IMode'.
 
 
 ==== tests/cases/compiler/recursiveClassReferenceTest.ts (4 errors) ====
@@ -107,7 +108,8 @@ tests/cases/compiler/recursiveClassReferenceTest.ts(95,21): error TS2741: Proper
     		public getInitialState(): IState {
     			return new State(self);
     			                 ~~~~
-!!! error TS2741: Property 'getInitialState' is missing in type 'Window' but required in type 'IMode'.
+!!! error TS2345: Argument of type 'Window' is not assignable to parameter of type 'IMode'.
+!!! error TS2345:   Property 'getInitialState' is missing in type 'Window' but required in type 'IMode'.
 !!! related TS2728 tests/cases/compiler/recursiveClassReferenceTest.ts:66:19: 'getInitialState' is declared here.
     		}
     
diff --git a/tests/baselines/reference/restTupleElements1.errors.txt b/tests/baselines/reference/restTupleElements1.errors.txt
index 4589e1b7bc07f..9782be35566b1 100644
--- a/tests/baselines/reference/restTupleElements1.errors.txt
+++ b/tests/baselines/reference/restTupleElements1.errors.txt
@@ -3,9 +3,12 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(8,13): error TS1256: A
 tests/cases/conformance/types/tuple/restTupleElements1.ts(9,13): error TS2574: A rest element type must be an array type.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(10,13): error TS2574: A rest element type must be an array type.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(10,16): error TS8020: JSDoc types can only be used inside documentation comments.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(23,31): error TS2741: Property '0' is missing in type 'number[]' but required in type '[number, ...number[]]'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(24,31): error TS2741: Property '0' is missing in type '[]' but required in type '[number, ...number[]]'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(29,18): error TS2741: Property '0' is missing in type 'number[]' but required in type '[number]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(23,31): error TS2344: Type 'number[]' does not satisfy the constraint '[number, ...number[]]'.
+  Property '0' is missing in type 'number[]' but required in type '[number, ...number[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(24,31): error TS2344: Type '[]' does not satisfy the constraint '[number, ...number[]]'.
+  Property '0' is missing in type '[]' but required in type '[number, ...number[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(29,18): error TS2344: Type 'number[]' does not satisfy the constraint '[number]'.
+  Property '0' is missing in type 'number[]' but required in type '[number]'.
 tests/cases/conformance/types/tuple/restTupleElements1.ts(30,18): error TS2344: Type '[number, ...number[]]' does not satisfy the constraint '[number]'.
   Types of property 'length' are incompatible.
     Type 'number' is not assignable to type '1'.
@@ -19,7 +22,8 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(34,31): error TS2344:
 tests/cases/conformance/types/tuple/restTupleElements1.ts(35,31): error TS2344: Type '[number, number, number, string]' does not satisfy the constraint '[number, ...number[]]'.
   Property '3' is incompatible with rest element type.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2741: Property '0' is missing in type '[]' but required in type '[{}, ...{}[]]'.
+tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2345: Argument of type '[]' is not assignable to parameter of type '[{}, ...{}[]]'.
+  Property '0' is missing in type '[]' but required in type '[{}, ...{}[]]'.
 
 
 ==== tests/cases/conformance/types/tuple/restTupleElements1.ts (14 errors) ====
@@ -57,17 +61,20 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2741: P
     
     assign<[number, ...number[]], number[]>();  // Error
                                   ~~~~~~~~
-!!! error TS2741: Property '0' is missing in type 'number[]' but required in type '[number, ...number[]]'.
+!!! error TS2344: Type 'number[]' does not satisfy the constraint '[number, ...number[]]'.
+!!! error TS2344:   Property '0' is missing in type 'number[]' but required in type '[number, ...number[]]'.
     assign<[number, ...number[]], []>();  // Error
                                   ~~
-!!! error TS2741: Property '0' is missing in type '[]' but required in type '[number, ...number[]]'.
+!!! error TS2344: Type '[]' does not satisfy the constraint '[number, ...number[]]'.
+!!! error TS2344:   Property '0' is missing in type '[]' but required in type '[number, ...number[]]'.
     assign<[number, ...number[]], [number]>();
     assign<[number, ...number[]], [number, number]>();
     assign<[number, ...number[]], [number, number, ...number[]]>();
     
     assign<[number], [...number[]]>();  // Error
                      ~~~~~~~~~~~~~
-!!! error TS2741: Property '0' is missing in type 'number[]' but required in type '[number]'.
+!!! error TS2344: Type 'number[]' does not satisfy the constraint '[number]'.
+!!! error TS2344:   Property '0' is missing in type 'number[]' but required in type '[number]'.
     assign<[number], [number, ...number[]]>();  // Error
                      ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2344: Type '[number, ...number[]]' does not satisfy the constraint '[number]'.
@@ -117,7 +124,8 @@ tests/cases/conformance/types/tuple/restTupleElements1.ts(59,4): error TS2741: P
     
     f0([]);  // Error
        ~~
-!!! error TS2741: Property '0' is missing in type '[]' but required in type '[{}, ...{}[]]'.
+!!! error TS2345: Argument of type '[]' is not assignable to parameter of type '[{}, ...{}[]]'.
+!!! error TS2345:   Property '0' is missing in type '[]' but required in type '[{}, ...{}[]]'.
     f0([1]);
     f0([1, 2, 3]);
     f0([1, "hello", true]);
diff --git a/tests/baselines/reference/strictBindCallApply1.errors.txt b/tests/baselines/reference/strictBindCallApply1.errors.txt
index 8b1d2787e79af..e8f48e5597c12 100644
--- a/tests/baselines/reference/strictBindCallApply1.errors.txt
+++ b/tests/baselines/reference/strictBindCallApply1.errors.txt
@@ -2,7 +2,8 @@ tests/cases/conformance/functions/strictBindCallApply1.ts(6,35): error TS2345: A
 tests/cases/conformance/functions/strictBindCallApply1.ts(9,11): error TS2554: Expected 3 arguments, but got 2.
 tests/cases/conformance/functions/strictBindCallApply1.ts(10,35): error TS2345: Argument of type '20' is not assignable to parameter of type 'string'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(11,11): error TS2554: Expected 3 arguments, but got 4.
-tests/cases/conformance/functions/strictBindCallApply1.ts(14,32): error TS2741: Property '1' is missing in type '[number]' but required in type '[number, string]'.
+tests/cases/conformance/functions/strictBindCallApply1.ts(14,32): error TS2345: Argument of type '[number]' is not assignable to parameter of type '[number, string]'.
+  Property '1' is missing in type '[number]' but required in type '[number, string]'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(15,37): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/functions/strictBindCallApply1.ts(16,32): error TS2345: Argument of type '[number, string, number]' is not assignable to parameter of type '[number, string]'.
   Types of property 'length' are incompatible.
@@ -50,7 +51,8 @@ tests/cases/conformance/functions/strictBindCallApply1.ts(57,12): error TS2345:
     let a00 = foo.apply(undefined, [10, "hello"]);
     let a01 = foo.apply(undefined, [10]);  // Error
                                    ~~~~
-!!! error TS2741: Property '1' is missing in type '[number]' but required in type '[number, string]'.
+!!! error TS2345: Argument of type '[number]' is not assignable to parameter of type '[number, string]'.
+!!! error TS2345:   Property '1' is missing in type '[number]' but required in type '[number, string]'.
     let a02 = foo.apply(undefined, [10, 20]);  // Error
                                         ~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
index 250923a66ff39..7fd7aec543824 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt
@@ -4,7 +4,8 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,11): error TS2415: Class 'B' incorrectly extends base class 'A<Base>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'Base'.
-tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,23): error TS2741: Property 'bar' is missing in type 'Base' but required in type 'Derived'.
+tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(20,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
+  Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts(24,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -40,7 +41,8 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
-!!! error TS2741: Property 'bar' is missing in type 'Base' but required in type 'Derived'.
+!!! error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
+!!! error TS2344:   Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts:4:34: 'bar' is declared here.
             [x: number]: string; // error
         }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
index 746b7516ffef3..bf7af9ca166d6 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt
@@ -4,7 +4,8 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,11): error TS2415: Class 'B' incorrectly extends base class 'A<Base>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'Base'.
-tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,23): error TS2741: Property 'bar' is missing in type 'Base' but required in type 'Derived'.
+tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(20,23): error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
+  Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts(24,11): error TS2415: Class 'B3<T>' incorrectly extends base class 'A<T>'.
   Index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -40,7 +41,8 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2415:   Index signatures are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'Base'.
                           ~~~~
-!!! error TS2741: Property 'bar' is missing in type 'Base' but required in type 'Derived'.
+!!! error TS2344: Type 'Base' does not satisfy the constraint 'Derived'.
+!!! error TS2344:   Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts:4:34: 'bar' is declared here.
             [x: string]: string; // error
         }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
index c32e3f2da2025..b70344e0a0669 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(9,13): error TS2741: Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
+tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(9,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(10,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(11,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1.ts(12,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
@@ -19,7 +20,8 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     
     var a = foo([]);             // number
                 ~~
-!!! error TS2741: Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
+!!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
 !!! related TS2728 /.ts/lib.es5.d.ts:595:14: 'raw' is declared here.
     var b = foo([], 1);          // string
                 ~~
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
index f9a262b28d5a0..7cdc02c457d99 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(9,13): error TS2741: Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
+tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(9,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(10,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(11,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
 tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6.ts(12,13): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
@@ -19,7 +20,8 @@ tests/cases/conformance/es6/templates/taggedTemplateStringsWithOverloadResolutio
     
     var a = foo([]);             // number
                 ~~
-!!! error TS2741: Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
+!!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type 'undefined[]' but required in type 'TemplateStringsArray'.
 !!! related TS2728 /.ts/lib.es5.d.ts:595:14: 'raw' is declared here.
     var b = foo([], 1);          // string
                 ~~
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
index 644bfa31d57da..4b300fef8c96d 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(7,3): error TS2740: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
+tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(7,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+  Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (1 errors) ====
@@ -10,6 +11,7 @@ tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(7,3): error TS2
     
     f({}, 10, 10);
       ~~
-!!! error TS2740: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
index 63c2b6a1acf30..989483bda62d1 100644
--- a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(4,3): error TS2740: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
+tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(4,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+  Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts (1 errors) ====
@@ -7,6 +8,7 @@ tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(4,3): error TS
     
     f({}, 10, 10);
       ~~
-!!! error TS2740: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 10 more.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
index 2ed0cc3d673ca..666df6d35cb5f 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(7,3): error TS2740: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 16 more.
+tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(7,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+  Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 16 more.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (1 errors) ====
@@ -10,6 +11,7 @@ tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(7,3): error T
     
     f({}, 10, 10);
       ~~
-!!! error TS2740: Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 16 more.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Type '{}' is missing the following properties from type 'TemplateStringsArray': raw, length, concat, join, and 16 more.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
index 57b3a4cd611d5..9222b23d4f1dd 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -16,7 +16,8 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(67,1): err
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(68,1): error TS2684: The 'this' context of type '{ y: string; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
   Types of property 'y' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2741: Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but required in type '{ y: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2684: The 'this' context of type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
+  Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but required in type '{ y: number; }'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(72,1): error TS2554: Expected 1 arguments, but got 0.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(73,13): error TS2345: Argument of type '"wrong type"' is not assignable to parameter of type 'number'.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(74,1): error TS2554: Expected 1 arguments, but got 2.
@@ -197,7 +198,8 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(178,22): e
 !!! error TS2684:     Type 'string' is not assignable to type 'number'.
     wrongPropertyName.f(13);
     ~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but required in type '{ y: number; }'.
+!!! error TS2684: The 'this' context of type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
+!!! error TS2684:   Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' but required in type '{ y: number; }'.
 !!! related TS2728 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts:63:56: 'y' is declared here.
     
     let c = new C();
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
index a1b2dd197a1e2..ce0f478610bf2 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2741: Property 'y' is missing in type 'Elephant' but required in type 'Giraffe'.
+tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2345: Argument of type 'Elephant' is not assignable to parameter of type 'Giraffe'.
+  Property 'y' is missing in type 'Elephant' but required in type 'Giraffe'.
 
 
 ==== tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts (1 errors) ====
@@ -10,5 +11,6 @@ tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): er
     var e: Elephant;
     f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
          ~
-!!! error TS2741: Property 'y' is missing in type 'Elephant' but required in type 'Giraffe'.
+!!! error TS2345: Argument of type 'Elephant' is not assignable to parameter of type 'Giraffe'.
+!!! error TS2345:   Property 'y' is missing in type 'Elephant' but required in type 'Giraffe'.
 !!! related TS2728 tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts:2:36: 'y' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index d79522e8d51f6..27de59a76453f 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -1,8 +1,12 @@
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(5,9): error TS2558: Expected 0 type arguments, but got 1.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2741: Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2739: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2741: Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2741: Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,5): error TS2304: Cannot find name 'numOrStr'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS1005: '>' expected.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS2304: Cannot find name 'is'.
@@ -54,22 +58,26 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     someBase = <SomeBase>someBase;
     someBase = <SomeBase>someOther; // Error
                ~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
+!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeBase' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'p' is missing in type 'SomeOther' but required in type 'SomeBase'.
 !!! related TS2728 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:15:13: 'p' is declared here.
     
     someDerived = <SomeDerived>someDerived;
     someDerived = <SomeDerived>someBase;
     someDerived = <SomeDerived>someOther; // Error
                   ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2739: Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
+!!! error TS2352: Conversion of type 'SomeOther' to type 'SomeDerived' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Type 'SomeOther' is missing the following properties from type 'SomeDerived': x, p
     
     someOther = <SomeOther>someDerived; // Error
                 ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
+!!! error TS2352: Conversion of type 'SomeDerived' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'q' is missing in type 'SomeDerived' but required in type 'SomeOther'.
 !!! related TS2728 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:21:13: 'q' is declared here.
     someOther = <SomeOther>someBase; // Error
                 ~~~~~~~~~~~~~~~~~~~
-!!! error TS2741: Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
+!!! error TS2352: Conversion of type 'SomeBase' to type 'SomeOther' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+!!! error TS2352:   Property 'q' is missing in type 'SomeBase' but required in type 'SomeOther'.
 !!! related TS2728 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:21:13: 'q' is declared here.
     someOther = <SomeOther>someOther;
     
diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
index 21943317a61f2..e91afe8d02004 100644
--- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
+++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt
@@ -1,14 +1,19 @@
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2741: Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
+  Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(13,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2741: Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
+  Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(15,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2741: Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2741: Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
-tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2741: Property 'b' is missing in type 'I1' but required in type 'I2'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
+  Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
+  Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
+tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
+  Property 'b' is missing in type 'I1' but required in type 'I2'.
 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
 
 
@@ -26,7 +31,8 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     // Below should be in error
     var x1: A<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
-!!! error TS2741: Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
+!!! error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
+!!! error TS2344:   Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
 !!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:12:13: 'a' is declared here.
     var x2: A<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
@@ -35,7 +41,8 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
 !!! error TS2344:     Type 'number' is not assignable to type 'string'.
     var x3: B<{ a: string;}, { b: string }>;
                              ~~~~~~~~~~~~~
-!!! error TS2741: Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
+!!! error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'.
+!!! error TS2344:   Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
 !!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:14:13: 'a' is declared here.
     var x4: B<{ a: string;}, { a: number }>;
                              ~~~~~~~~~~~~~
@@ -44,11 +51,13 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
 !!! error TS2344:     Type 'number' is not assignable to type 'string'.
     var x5: A<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
-!!! error TS2741: Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
+!!! error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
+!!! error TS2344:   Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
 !!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:16:24: 'b' is declared here.
     var x6: B<{ a: string; b: number }, { a: string }>;
                                         ~~~~~~~~~~~~~
-!!! error TS2741: Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
+!!! error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'.
+!!! error TS2344:   Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: number; }'.
 !!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:17:24: 'b' is declared here.
     
     interface I1 {
@@ -62,7 +71,8 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Typ
     
     var x7: A<I2, I1>;
                   ~~
-!!! error TS2741: Property 'b' is missing in type 'I1' but required in type 'I2'.
+!!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'.
+!!! error TS2344:   Property 'b' is missing in type 'I1' but required in type 'I2'.
 !!! related TS2728 tests/cases/compiler/typeParamExtendsOtherTypeParam.ts:25:5: 'b' is declared here.
     var x8: B<I2, I1>;
                   ~~
diff --git a/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
index 5b083f94a3cc0..7d81ddab00e3b 100644
--- a/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
+++ b/tests/baselines/reference/typedefMultipleTypeParameters.errors.txt
@@ -1,6 +1,8 @@
-tests/cases/conformance/jsdoc/a.js(12,23): error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
+tests/cases/conformance/jsdoc/a.js(12,23): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
+  Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
 tests/cases/conformance/jsdoc/a.js(15,12): error TS2314: Generic type 'Everything' requires 5 type argument(s).
-tests/cases/conformance/jsdoc/test.ts(1,34): error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
+tests/cases/conformance/jsdoc/test.ts(1,34): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
+  Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
 
 
 ==== tests/cases/conformance/jsdoc/a.js (2 errors) ====
@@ -17,7 +19,8 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2741: Property 'b' is missi
     
     /** @type {Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>} */
                           ~~~~~~~~~~~~~~
-!!! error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
+!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
+!!! error TS2344:   Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
 !!! related TS2728 tests/cases/conformance/jsdoc/a.js:2:28: 'b' is declared here.
     var wrong;
     
@@ -29,6 +32,7 @@ tests/cases/conformance/jsdoc/test.ts(1,34): error TS2741: Property 'b' is missi
 ==== tests/cases/conformance/jsdoc/test.ts (1 errors) ====
     declare var actually: Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>;
                                      ~~~~~~~~~~~~~~
-!!! error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
+!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: number; b: string; }'.
+!!! error TS2344:   Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: string; }'.
 !!! related TS2728 tests/cases/conformance/jsdoc/a.js:2:28: 'b' is declared here.
     
\ No newline at end of file